From ce2446922ec64776758bf6ee33ce643a3c7f7264 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sat, 8 Mar 2025 14:22:04 -0700 Subject: [PATCH] [MIRROR] Initialize fixing (#10335) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- archive/maps/cynosure/cynosure_defines.dm | 20 +- archive/maps/cynosure/overmap/sectors.dm | 4 +- archive/maps/gateway_archive_vr/labyrinth.dm | 2 +- archive/maps/gateway_archive_vr/wildwest.dm | 2 +- .../maps/southern_cross/overmap/sectors.dm | 6 +- .../southern_cross/southern_cross_defines.dm | 20 +- .../southern_cross_overrides.dm | 2 +- .../structures/closets/engineering.dm | 2 +- .../structures/closets/medical.dm | 2 +- .../southern_cross/structures/closets/misc.dm | 6 +- .../structures/closets/security.dm | 2 +- archive/maps/submaps/depreciated_vr/talon.dm | 2 +- .../components/binary_devices/circulator.dm | 2 +- .../components/binary_devices/dp_vent_pump.dm | 4 +- .../components/binary_devices/passive_gate.dm | 2 +- .../components/binary_devices/pipeturbine.dm | 2 +- .../components/binary_devices/pump.dm | 2 +- .../components/omni_devices/filter.dm | 2 +- .../components/omni_devices/mixer.dm | 2 +- .../components/omni_devices/omni_base.dm | 2 +- code/ATMOSPHERICS/components/shutoff.dm | 2 +- .../components/trinary_devices/filter.dm | 2 +- .../components/trinary_devices/mixer.dm | 2 +- .../trinary_devices/trinary_base.dm | 2 +- code/ATMOSPHERICS/components/tvalve.dm | 2 +- .../components/unary/cold_sink.dm | 2 +- .../components/unary/heat_source.dm | 2 +- .../components/unary/outlet_injector.dm | 2 +- .../components/unary/unary_base.dm | 2 +- .../components/unary/vent_pump.dm | 6 +- .../components/unary/vent_scrubber.dm | 2 +- code/ATMOSPHERICS/components/valve.dm | 2 +- code/ATMOSPHERICS/pipes/he_pipes.dm | 2 +- code/ATMOSPHERICS/pipes/manifold.dm | 2 +- code/ATMOSPHERICS/pipes/manifold4w.dm | 2 +- code/ATMOSPHERICS/pipes/pipe_base.dm | 2 +- code/ATMOSPHERICS/pipes/simple.dm | 2 +- code/ATMOSPHERICS/pipes/tank.dm | 14 +- code/__defines/_reagents_ch.dm | 2 + code/_helpers/unsorted.dm | 2 +- code/_onclick/hud/picture_in_picture.dm | 4 +- .../emergency_shuttle_controller.dm | 2 +- code/datums/beam.dm | 2 +- code/datums/components/recursive_move.dm | 2 +- code/datums/repositories/decls.dm | 4 +- code/defines/obj/weapon.dm | 2 +- code/game/area/areas.dm | 2 +- code/game/dna/dna_modifier.dm | 4 +- .../game/gamemodes/changeling/powers/armor.dm | 4 +- .../changeling/powers/fabricate_clothing.dm | 2 +- code/game/gamemodes/cult/cult_structures.dm | 4 +- code/game/gamemodes/cult/ritual.dm | 4 +- code/game/gamemodes/meteor/meteors.dm | 4 +- .../gamemodes/technomancer/spells/control.dm | 2 +- .../technomancer/spells/insert/insert.dm | 2 +- .../technomancer/spells/modifier/modifier.dm | 2 +- .../technomancer/spells/phase_shift.dm | 4 +- .../technomancer/spells/spawner/darkness.dm | 2 +- .../technomancer/spells/spawner/destablize.dm | 4 +- .../technomancer/spells/spawner/pulsar.dm | 4 +- code/game/machinery/CableLayer.dm | 2 +- code/game/machinery/Sleeper.dm | 6 +- code/game/machinery/adv_med.dm | 2 +- code/game/machinery/air_alarm.dm | 2 +- code/game/machinery/atm_ret_field.dm | 6 +- code/game/machinery/atmo_control.dm | 4 +- .../atmoalter/area_atmos_computer.dm | 2 +- code/game/machinery/atmoalter/canister.dm | 2 +- code/game/machinery/atmoalter/meter.dm | 2 +- code/game/machinery/atmoalter/scrubber.dm | 2 +- code/game/machinery/autolathe.dm | 2 +- code/game/machinery/biogenerator.dm | 2 +- code/game/machinery/bioprinter.dm | 6 +- code/game/machinery/camera/presets.dm | 2 +- code/game/machinery/cell_charger.dm | 2 +- code/game/machinery/cloning.dm | 6 +- code/game/machinery/computer/arcade.dm | 2 +- code/game/machinery/computer/camera.dm | 6 +- code/game/machinery/computer/cloning.dm | 2 +- .../game/machinery/computer/communications.dm | 2 +- code/game/machinery/computer/guestpass.dm | 2 +- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/message.dm | 4 +- code/game/machinery/computer/pod.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/computer/skills.dm | 2 +- code/game/machinery/computer/station_alert.dm | 2 +- code/game/machinery/computer/timeclock_vr.dm | 2 +- code/game/machinery/cryo.dm | 2 +- code/game/machinery/cryopod.dm | 4 +- code/game/machinery/doorbell_vr.dm | 4 +- code/game/machinery/doors/airlock.dm | 2 +- .../machinery/doors/airlock_angled_bay.dm | 2 +- code/game/machinery/doors/airlock_control.dm | 6 +- code/game/machinery/doors/alarmlock.dm | 2 +- code/game/machinery/doors/blast_door.dm | 2 +- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/doors/firedoor.dm | 2 +- .../airlock_controllers_dummy.dm | 2 +- .../airlock_docking_controller.dm | 4 +- .../airlock_docking_controller_multi.dm | 4 +- .../embedded_controller_base.dm | 4 +- .../embedded_controller/mapping_helpers.dm | 2 +- code/game/machinery/exonet_node.dm | 4 +- code/game/machinery/fire_alarm.dm | 2 +- code/game/machinery/gear_dispenser.dm | 6 +- code/game/machinery/holoposter.dm | 2 +- code/game/machinery/jukebox.dm | 2 +- code/game/machinery/lightswitch.dm | 3 +- code/game/machinery/machinery_power.dm | 2 +- code/game/machinery/medical_kiosk.dm | 2 +- code/game/machinery/newscaster.dm | 2 +- code/game/machinery/oxygen_pump.dm | 2 +- code/game/machinery/pda_multicaster.dm | 5 +- code/game/machinery/pointdefense.dm | 2 +- code/game/machinery/portable_turret.dm | 2 +- code/game/machinery/protean_reconstitutor.dm | 2 +- code/game/machinery/recharger.dm | 2 +- code/game/machinery/rechargestation.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/status_display.dm | 2 +- code/game/machinery/suit_dispenser.dm | 4 +- .../machinery/suit_storage/suit_cycler.dm | 2 +- .../machinery/suit_storage/suit_storage.dm | 2 +- code/game/machinery/telecomms/broadcaster.dm | 2 +- code/game/machinery/telecrystal_storage_ch.dm | 2 +- code/game/machinery/teleporter.dm | 6 +- code/game/machinery/turret_control.dm | 2 +- .../machinery/virtual_reality/ar_console.dm | 2 +- .../machinery/virtual_reality/vr_console.dm | 6 +- code/game/machinery/vitals_monitor.dm | 2 +- code/game/machinery/washing_machine.dm | 2 +- code/game/mecha/combat/fighter.dm | 14 +- code/game/mecha/combat/gorilla.dm | 2 +- code/game/mecha/combat/phazon.dm | 2 +- code/game/mecha/components/_component.dm | 2 +- .../mecha/equipment/tools/extinguisher.dm | 2 +- code/game/mecha/equipment/tools/generator.dm | 2 +- .../game/mecha/equipment/tools/inflatables.dm | 2 +- code/game/mecha/equipment/tools/orescanner.dm | 4 +- code/game/mecha/equipment/tools/powertool.dm | 2 +- code/game/mecha/equipment/tools/rcd.dm | 2 +- .../game/mecha/equipment/tools/shield_omni.dm | 2 +- .../game/mecha/equipment/tools/syringe_gun.dm | 4 +- code/game/mecha/mech_bay.dm | 2 +- code/game/mecha/mech_fabricator.dm | 2 +- code/game/mecha/mech_prosthetics.dm | 2 +- code/game/mecha/mech_sensor.dm | 2 +- code/game/mecha/medical/medical.dm | 2 +- code/game/mecha/space/hoverpod.dm | 6 +- code/game/mecha/working/working.dm | 2 +- code/game/objects/effects/alien/alien egg.dm | 2 +- code/game/objects/effects/alien/aliens.dm | 6 +- .../objects/effects/bluespace_spawner_ch.dm | 4 +- code/game/objects/effects/bump_teleporter.dm | 2 +- code/game/objects/effects/chem/chemsmoke.dm | 2 +- code/game/objects/effects/chem/coating.dm | 2 +- code/game/objects/effects/chem/foam_vr.dm | 4 +- code/game/objects/effects/chem/water.dm | 2 +- code/game/objects/effects/confetti_vr.dm | 4 +- .../effects/decals/Cleanable/humans.dm | 4 +- .../game/objects/effects/decals/contraband.dm | 2 +- .../objects/effects/decals/posters/posters.dm | 2 +- .../objects/effects/decals/warning_stripes.dm | 2 +- code/game/objects/effects/effect_system.dm | 6 +- code/game/objects/effects/effect_system_ch.dm | 4 +- .../objects/effects/explosion_particles.dm | 4 +- code/game/objects/effects/landmarks_events.dm | 4 +- code/game/objects/effects/landmarks_poi_vr.dm | 2 +- code/game/objects/effects/landmarks_vr.dm | 2 +- code/game/objects/effects/manifest.dm | 2 +- .../objects/effects/map_effects/beam_point.dm | 2 +- .../effects/map_effects/effect_emitter.dm | 2 +- .../effects/map_effects/map_effects.dm | 6 +- .../objects/effects/map_effects/portal.dm | 2 +- .../effects/map_effects/radiation_emitter.dm | 4 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/effects/misc.dm | 8 +- code/game/objects/effects/overlays.dm | 4 +- code/game/objects/effects/portals.dm | 2 +- code/game/objects/effects/prop/columnblast.dm | 4 +- .../objects/effects/spawners/bombspawner.dm | 4 +- .../game/objects/effects/spawners/graffiti.dm | 2 +- code/game/objects/effects/spiders.dm | 4 +- code/game/objects/effects/step_triggers.dm | 4 +- .../temporary_visuals/temporary_visual.dm | 4 +- .../temporary_visuials/temproary_visual.dm | 2 +- code/game/objects/items/bodybag.dm | 2 +- code/game/objects/items/contraband.dm | 4 +- .../items/devices/communicator/cartridge.dm | 13 +- .../devices/communicator/communicator.dm | 2 +- code/game/objects/items/devices/defib.dm | 2 +- code/game/objects/items/devices/flash.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 6 +- code/game/objects/items/devices/geiger.dm | 4 +- code/game/objects/items/devices/geiger_yw.dm | 4 +- code/game/objects/items/devices/gps.dm | 2 +- code/game/objects/items/devices/paicard_vr.dm | 2 +- .../objects/items/devices/radio/headset.dm | 4 +- .../objects/items/devices/radio/intercom.dm | 16 +- .../objects/items/devices/radio/jammer.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 2 +- .../objects/items/devices/radio/radio_ch.dm | 12 +- .../objects/items/devices/radio/radio_vr.dm | 2 +- .../objects/items/devices/radio/radiopack.dm | 2 +- .../items/devices/scanners/sleevemate.dm | 2 +- .../objects/items/devices/suit_cooling.dm | 2 +- .../objects/items/devices/translocator_vr.dm | 2 +- code/game/objects/items/devices/tvcamera.dm | 4 +- code/game/objects/items/devices/uplink.dm | 4 +- .../objects/items/falling_object_attack_vr.dm | 14 +- code/game/objects/items/magazine.dm | 2 +- code/game/objects/items/paintkit.dm | 2 +- .../objects/items/stacks/marker_beacons.dm | 2 +- code/game/objects/items/stacks/medical_vr.dm | 2 +- code/game/objects/items/stacks/tickets.dm | 4 +- .../objects/items/stacks/tiles/tile_types.dm | 2 +- code/game/objects/items/toys/mech_toys.dm | 2 +- code/game/objects/items/trash_material.dm | 8 +- code/game/objects/items/uav.dm | 2 +- code/game/objects/items/weapons/AI_modules.dm | 2 +- code/game/objects/items/weapons/RCD.dm | 10 +- code/game/objects/items/weapons/RCD_vr.dm | 2 +- code/game/objects/items/weapons/RMS_vr.dm | 2 +- code/game/objects/items/weapons/RPD_vr.dm | 2 +- code/game/objects/items/weapons/candle.dm | 4 +- code/game/objects/items/weapons/canes.dm | 2 +- .../objects/items/weapons/capture_crystal.dm | 4 +- code/game/objects/items/weapons/chewables.dm | 10 +- .../objects/items/weapons/cigs_lighters.dm | 12 +- .../circuitboards/computer/camera_monitor.dm | 6 +- code/game/objects/items/weapons/cosmetics.dm | 2 +- .../objects/items/weapons/dna_injector.dm | 28 +- .../objects/items/weapons/extinguisher.dm | 2 +- .../items/weapons/grenades/chem_grenade.dm | 12 +- .../objects/items/weapons/id cards/cards.dm | 2 +- .../items/weapons/id cards/cards_vr.dm | 2 +- .../items/weapons/id cards/id_stacks.dm | 2 +- .../items/weapons/id cards/station_ids.dm | 12 +- .../items/weapons/id cards/syndicate_ids.dm | 4 +- code/game/objects/items/weapons/inducer_vr.dm | 4 +- code/game/objects/items/weapons/manuals_vr.dm | 12 +- .../items/weapons/material/chainsaw.dm | 2 +- .../objects/items/weapons/material/kitchen.dm | 2 +- code/game/objects/items/weapons/paint.dm | 2 +- .../objects/items/weapons/picnic_blankets.dm | 2 +- code/game/objects/items/weapons/policetape.dm | 2 +- .../objects/items/weapons/storage/backpack.dm | 4 +- .../objects/items/weapons/storage/egg_vr.dm | 2 +- .../objects/items/weapons/storage/fancy.dm | 16 +- .../objects/items/weapons/storage/firstaid.dm | 4 +- .../objects/items/weapons/storage/misc.dm | 4 +- .../game/objects/items/weapons/storage/mre.dm | 4 +- .../objects/items/weapons/storage/toolbox.dm | 6 +- .../items/weapons/storage/uplink_kits.dm | 10 +- .../objects/items/weapons/tanks/jetpack.dm | 10 +- .../objects/items/weapons/tanks/tank_types.dm | 30 +- .../items/weapons/tanks/tank_types_vr.dm | 2 +- .../game/objects/items/weapons/tanks/tanks.dm | 2 +- .../items/weapons/tools/weldingtool.dm | 2 +- .../objects/items/weapons/weldbackpack.dm | 2 +- code/game/objects/mail.dm | 12 +- code/game/objects/micro_event.dm | 2 +- code/game/objects/micro_structures.dm | 4 +- code/game/objects/random/_random.dm | 6 +- code/game/objects/structures/artstuff.dm | 4 +- code/game/objects/structures/catwalk.dm | 2 +- code/game/objects/structures/cliff.dm | 4 +- .../structures/crates_lockers/__closets.dm | 2 +- .../crates_lockers/closets/misc_vr.dm | 10 +- .../crates_lockers/closets/secure/cargo.dm | 8 +- .../crates_lockers/closets/secure/cargo_vr.dm | 4 +- .../closets/secure/engineering.dm | 6 +- .../closets/secure/guncabinet.dm | 2 +- .../closets/secure/hydroponics.dm | 4 +- .../crates_lockers/closets/secure/medical.dm | 4 +- .../closets/secure/medical_vr.dm | 4 +- .../crates_lockers/closets/secure/personal.dm | 2 +- .../closets/secure/scientist.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 14 +- .../closets/secure/security_vr.dm | 6 +- .../crates_lockers/closets/syndicate.dm | 4 +- .../crates_lockers/closets/utility_closets.dm | 4 +- .../closets/utility_closets_vr.dm | 2 +- .../crates_lockers/closets/wardrobe.dm | 8 +- .../structures/crates_lockers/largecrate.dm | 4 +- .../crates_lockers/largecrate_vr.dm | 14 +- .../crates_lockers/largecrate_yw.dm | 2 +- .../structures/crates_lockers/vehiclecage.dm | 2 +- code/game/objects/structures/electricchair.dm | 2 +- code/game/objects/structures/fence.dm | 4 +- code/game/objects/structures/fireaxe.dm | 2 +- code/game/objects/structures/flora/flora.dm | 12 +- .../objects/structures/flora/moretrees_vr.dm | 4 +- code/game/objects/structures/flora/trees.dm | 4 +- .../objects/structures/ghost_pods/event_vr.dm | 4 +- .../structures/ghost_pods/ghost_pods.dm | 2 +- .../objects/structures/ghost_pods/human.dm | 4 +- .../objects/structures/ghost_pods/silicon.dm | 2 +- .../objects/structures/ghost_pods/survivor.dm | 2 +- code/game/objects/structures/holoplant.dm | 4 +- .../objects/structures/kitchen_foodcart_vr.dm | 2 +- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/lightpost.dm | 4 +- code/game/objects/structures/loot_piles.dm | 2 +- code/game/objects/structures/low_wall.dm | 8 +- .../game/objects/structures/map_blocker_vr.dm | 2 +- code/game/objects/structures/pillows.dm | 2 +- .../objects/structures/props/alien_props.dm | 2 +- .../game/objects/structures/props/altevian.dm | 2 +- .../objects/structures/props/beam_prism.dm | 4 +- .../game/objects/structures/props/machines.dm | 2 +- code/game/objects/structures/props/nest.dm | 2 +- .../objects/structures/props/puzzledoor.dm | 2 +- code/game/objects/structures/props/swarm.dm | 2 +- .../objects/structures/props/transmitter.dm | 2 +- code/game/objects/structures/railing.dm | 2 +- code/game/objects/structures/safe.dm | 4 +- code/game/objects/structures/salvageable.dm | 16 +- code/game/objects/structures/signs.dm | 6 +- code/game/objects/structures/stasis_cage.dm | 2 +- .../structures/stool_bed_chair_nest/bed.dm | 2 +- .../stool_bed_chair_nest/chairs_ch.dm | 16 +- .../game/objects/structures/tank_dispenser.dm | 2 +- code/game/objects/structures/trash_pile_vr.dm | 2 +- .../objects/structures/trash_pile_vr_ch.dm | 12 +- code/game/objects/structures/watercloset.dm | 2 +- .../game/objects/structures/watercloset_vr.dm | 4 +- .../game/objects/structures/window_spawner.dm | 2 +- code/game/shuttle_engines.dm | 2 +- code/game/turfs/flooring/flooring_decals.dm | 6 +- code/game/turfs/flooring/flooring_premade.dm | 2 +- code/game/turfs/flooring/seasonal.dm | 6 +- code/game/turfs/simulated.dm | 2 +- code/game/turfs/simulated/dungeon/wall.dm | 2 +- code/game/turfs/simulated/fancy_shuttles.dm | 4 +- code/game/turfs/simulated/floor_types.dm | 6 +- code/game/turfs/simulated/floor_types_eris.dm | 2 +- code/game/turfs/simulated/lava.dm | 4 +- code/game/turfs/simulated/outdoors/grass.dm | 6 +- code/game/turfs/simulated/outdoors/sky.dm | 4 +- code/game/turfs/simulated/outdoors/snow_yw.dm | 4 +- code/game/turfs/simulated/wall_types.dm | 8 +- code/game/turfs/simulated/wall_types_vr.dm | 2 +- code/game/turfs/simulated/water.dm | 2 +- code/game/turfs/space/space.dm | 2 +- code/game/turfs/space/transit.dm | 4 +- code/game/turfs/unsimulated/beach.dm | 6 +- code/game/turfs/unsimulated/planetary.dm | 2 +- code/game/turfs/unsimulated/sky_vr.dm | 2 +- code/game/vehicles/vehicle.dm | 2 +- code/modules/ai/ai_holder.dm | 4 +- code/modules/artifice/cursedform.dm | 2 +- code/modules/artifice/telecube.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/awaymissions/corpse.dm | 5 +- code/modules/awaymissions/gateway.dm | 6 +- code/modules/awaymissions/loot.dm | 2 +- .../overmap_renamer/debrisfield_renamer.dm | 2 +- .../overmap_renamer/overmap_renamer.dm | 2 +- code/modules/awaymissions/redgate.dm | 6 +- code/modules/awaymissions/zlevel.dm | 8 +- code/modules/blob2/blobs/base_blob.dm | 2 +- code/modules/blob2/blobs/core.dm | 4 +- code/modules/blob2/blobs/resource.dm | 2 +- code/modules/blob2/overmind/overmind.dm | 4 +- code/modules/casino/casino.dm | 2 +- code/modules/casino/casino_prize_vendor.dm | 2 +- code/modules/catalogue/cataloguer.dm | 2 +- .../preference_setup/loadout/loadout_shoes.dm | 5 +- code/modules/client/stored_item.dm | 2 +- .../clothing/accessories/accessory_vr.dm | 2 +- code/modules/clothing/accessories/rings.dm | 4 +- code/modules/clothing/accessories/storage.dm | 4 +- code/modules/clothing/accessories/torch.dm | 2 +- code/modules/clothing/gloves/color.dm | 2 +- code/modules/clothing/gloves/miscellaneous.dm | 2 +- code/modules/clothing/head/fishing.dm | 2 +- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/head/pilot_helmet.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 2 +- .../rig/modules/specific/crusher_gauntlets.dm | 2 +- .../modules/clothing/spacesuits/spacesuits.dm | 4 +- .../clothing/spacesuits/void/ert_vr.dm | 10 +- code/modules/clothing/spacesuits/void/void.dm | 2 +- .../clothing/spacesuits/void/void_vr.dm | 4 +- code/modules/clothing/under/miscellaneous.dm | 2 +- .../clothing/under/miscellaneous_vr.dm | 2 +- code/modules/clothing/under/xenos/vox.dm | 4 +- .../detectivework/microscope/dnascanner.dm | 2 +- code/modules/detectivework/tools/luminol.dm | 2 +- code/modules/detectivework/tools/rag.dm | 2 +- code/modules/economy/EFTPOS.dm | 2 +- code/modules/economy/vending.dm | 2 +- code/modules/economy/vending_refills.dm | 2 +- code/modules/emotes/emote_define.dm | 2 +- .../entrepreneur/entrepreneur_items.dm | 4 +- .../examine/descriptions/atmospherics.dm | 2 +- code/modules/fireworks/firework_launcher.dm | 2 +- code/modules/fishing/fishing_net.dm | 2 +- code/modules/fishing/fishing_rod.dm | 2 +- .../food/drinkingglass/drinkingglass.dm | 2 +- code/modules/food/drinkingglass/shaker.dm | 4 +- code/modules/food/drinkingglass/shaker_vr.dm | 2 +- code/modules/food/food.dm | 2 +- code/modules/food/food/cans.dm | 112 ++-- code/modules/food/food/cans_ch.dm | 2 +- code/modules/food/food/condiment.dm | 100 +-- code/modules/food/food/drinks.dm | 30 +- code/modules/food/food/drinks/bottle.dm | 102 +-- .../modules/food/food/drinks/drinkingglass.dm | 4 +- code/modules/food/food/snacks.dm | 618 +++++++++--------- code/modules/food/food/snacks/meat.dm | 20 +- code/modules/food/food/snacks_ch.dm | 12 +- code/modules/food/food/snacks_vr.dm | 120 ++-- code/modules/food/food/superfoods.dm | 2 +- code/modules/food/food/superfoods_ch.dm | 4 +- code/modules/food/food/z_custom_food_vr.dm | 7 +- code/modules/food/glass/bottle.dm | 2 +- code/modules/food/glass/bottle_vr.dm | 2 +- .../kitchen/cooking_machines/_appliance.dm | 2 +- .../food/kitchen/cooking_machines/_cooker.dm | 2 +- .../cooking_machines/_cooker_output.dm | 8 +- .../food/kitchen/cooking_machines/_mixer.dm | 2 +- .../food/kitchen/cooking_machines/candy.dm | 2 +- .../food/kitchen/cooking_machines/cereal.dm | 2 +- .../kitchen/cooking_machines/container.dm | 6 +- .../food/kitchen/cooking_machines/fryer.dm | 2 +- .../food/kitchen/cooking_machines/grill.dm | 2 +- .../food/kitchen/cooking_machines/oven.dm | 2 +- code/modules/food/kitchen/gibber.dm | 2 +- code/modules/food/kitchen/icecream.dm | 2 +- code/modules/food/kitchen/microwave.dm | 4 +- code/modules/food/kitchen/microwave_ch.dm | 6 +- .../food/kitchen/smartfridge/smartfridge.dm | 2 +- .../kitchen/smartfridge/smartfridge_vr.dm | 2 +- code/modules/holodeck/HolodeckObjects.dm | 2 +- code/modules/holomap/mapper.dm | 4 +- code/modules/holomap/station_holomap.dm | 4 +- code/modules/hydroponics/backtank.dm | 12 +- .../modules/hydroponics/beekeeping/beehive.dm | 4 +- code/modules/hydroponics/fruit_spawner.dm | 2 +- code/modules/hydroponics/grown_inedible.dm | 2 +- code/modules/hydroponics/seed_machines_yw.dm | 13 +- code/modules/hydroponics/seed_packets.dm | 2 +- code/modules/hydroponics/trays/tray.dm | 2 +- code/modules/instruments/items.dm | 8 +- .../integrated_electronics/core/assemblies.dm | 2 +- .../core/assemblies/clothing.dm | 14 +- .../integrated_electronics/core/detailer.dm | 2 +- .../integrated_electronics/core/tools.dm | 28 +- .../integrated_electronics/passive/power.dm | 2 +- .../integrated_electronics/subtypes/input.dm | 4 +- .../integrated_electronics/subtypes/output.dm | 4 +- .../hardcode_library/fiction/APsychonaut.dm | 2 +- code/modules/library/lib_items.dm | 2 +- code/modules/library/lib_machines.dm | 2 +- code/modules/lighting/lighting_fake_sun_vr.dm | 2 +- code/modules/looking_glass/lg_area.dm | 2 +- code/modules/looking_glass/lg_console.dm | 2 +- code/modules/looking_glass/lg_imageholder.dm | 6 +- code/modules/lore_codex/codex.dm | 2 +- code/modules/makeup/nailpolish.dm | 2 +- code/modules/materials/fifty_spawner.dm | 4 +- code/modules/materials/material_synth.dm | 2 +- code/modules/materials/sheets/_sheets.dm | 2 +- code/modules/materials/sheets/metals/rods.dm | 2 +- .../sheets/organic/tanning/tanning_rack.dm | 4 +- code/modules/media/juke_remote.dm | 2 +- code/modules/media/media_machinery.dm | 3 +- code/modules/mining/abandonedcrates_vr.dm | 2 +- code/modules/mining/drilling/drill.dm | 4 +- code/modules/mining/fulton.dm | 2 +- code/modules/mining/kinetic_crusher.dm | 2 +- .../mining/machinery/machine_processing.dm | 4 +- .../mining/machinery/machine_unloading.dm | 2 +- code/modules/mining/mine_items.dm | 2 +- code/modules/mining/mine_outcrops.dm | 2 +- code/modules/mining/mine_turfs.dm | 2 +- code/modules/mining/ore.dm | 2 +- code/modules/mining/resonator.dm | 2 +- code/modules/mining/resonator_vr.dm | 2 +- code/modules/mining/shelter_atoms_vr.dm | 2 +- code/modules/mob/freelook/ai/eye.dm | 2 +- code/modules/mob/freelook/update_triggers.dm | 2 +- code/modules/mob/holder.dm | 2 +- code/modules/mob/living/bot/bot.dm | 2 +- code/modules/mob/living/bot/cleanbot.dm | 2 +- code/modules/mob/living/bot/medbot.dm | 2 +- code/modules/mob/living/bot/mulebot.dm | 2 +- code/modules/mob/living/carbon/alien/alien.dm | 2 +- .../mob/living/carbon/alien/diona/diona.dm | 2 +- .../mob/living/carbon/alien/larva/larva.dm | 2 +- code/modules/mob/living/carbon/brain/brain.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- .../human/ai_controlled/ai_controlled.dm | 4 +- .../mob/living/carbon/human/human_species.dm | 6 +- code/modules/mob/living/carbon/human/npcs.dm | 2 +- .../human/species/lleill/lleill_items.dm | 2 +- .../human/species/shadekin/dark_portal_ch.dm | 2 +- .../species/station/protean_vr/protean_rig.dm | 2 +- .../species/station/traits_vr/weaver_objs.dm | 4 +- .../mob/living/carbon/metroid/items.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 2 +- .../living/silicon/ai/ai_remote_control.dm | 2 +- .../modules/mob/living/silicon/ai/multicam.dm | 6 +- code/modules/mob/living/silicon/pai/pai_vr.dm | 2 +- .../mob/living/silicon/pai/software.dm | 2 +- .../mob/living/silicon/robot/component.dm | 2 +- .../silicon/robot/dogborg/dog_modules_vr.dm | 2 +- .../mob/living/silicon/robot/drone/swarm.dm | 2 +- .../living/silicon/robot/drone/swarm_items.dm | 2 +- .../mob/living/silicon/robot/robot_items.dm | 4 +- .../silicon/robot/robot_remote_control.dm | 4 +- .../robot/subtypes/thinktank/_thinktank.dm | 2 +- .../subtypes/thinktank/thinktank_subtypes.dm | 2 +- .../mob/living/simple_mob/overmap_mob_vr.dm | 6 +- .../subtypes/animal/alien animals/catslug.dm | 16 +- .../animal/alien animals/jellyfish.dm | 2 +- .../animal/alien animals/spacewhale.dm | 2 +- .../animal/alien animals/spookyghost.dm | 2 +- .../subtypes/animal/alien animals/stardog.dm | 14 +- .../subtypes/animal/alien animals/teppi.dm | 2 +- .../simple_mob/subtypes/animal/borer/borer.dm | 2 +- .../animal/giant_spider/broodmother_spawn.dm | 20 +- .../subtypes/animal/giant_spider/carrier.dm | 2 +- .../subtypes/animal/giant_spider/pepper.dm | 2 +- .../animal/giant_spider/phorogenic.dm | 2 +- .../subtypes/animal/passive/armadillo_ch.dm | 2 +- .../subtypes/animal/passive/crab.dm | 2 +- .../subtypes/animal/passive/fish.dm | 6 +- .../subtypes/animal/passive/fish_vr.dm | 2 +- .../subtypes/animal/passive/lizard.dm | 4 +- .../subtypes/animal/passive/mouse.dm | 2 +- .../subtypes/animal/passive/possum.dm | 4 +- .../subtypes/animal/passive/raccoon_ch.dm | 2 +- .../simple_mob/subtypes/animal/pets/cat.dm | 4 +- .../simple_mob/subtypes/animal/pets/fennec.dm | 2 +- .../simple_mob/subtypes/animal/pets/parrot.dm | 4 +- .../subtypes/animal/sif/frostfly.dm | 2 +- .../subtypes/animal/sif/glitterfly.dm | 4 +- .../subtypes/animal/sif/grafadreka.dm | 2 +- .../simple_mob/subtypes/animal/sif/kururak.dm | 4 +- .../simple_mob/subtypes/animal/sif/leech.dm | 2 +- .../simple_mob/subtypes/animal/sif/moth.dm | 2 +- .../simple_mob/subtypes/animal/sif/racoon.dm | 2 +- .../simple_mob/subtypes/animal/sif/shantak.dm | 2 +- .../simple_mob/subtypes/animal/space/carp.dm | 2 +- .../subtypes/animal/space/snake_vr.dm | 2 +- .../simple_mob/subtypes/animal/space/worm.dm | 2 +- .../simple_mob/subtypes/animal/squirrel.dm | 4 +- .../subtypes/humanoid/humanoid_ch.dm | 4 - .../subtypes/humanoid/mercs/mercs_ch.dm | 2 +- .../subtypes/humanoid/pirates_ch.dm | 2 +- .../mechanical/drones/combat_drone.dm | 2 +- .../mechanical/drones/mining_drone.dm | 2 +- .../simple_mob/subtypes/mechanical/golem.dm | 2 +- .../subtypes/mechanical/hivebot/support.dm | 2 +- .../subtypes/mechanical/mecha/durand.dm | 2 +- .../subtypes/mechanical/mecha/hoverpod.dm | 2 +- .../subtypes/mechanical/mecha/mecha.dm | 2 +- .../living/simple_mob/subtypes/slime/slime.dm | 2 +- .../subtypes/slime/xenobio/subtypes.dm | 8 +- .../simple_mob/subtypes/vore/bigdragon.dm | 2 +- .../simple_mob/subtypes/vore/bigdragon_ch.dm | 4 +- .../subtypes/vore/dominated_brain.dm | 2 +- .../living/simple_mob/subtypes/vore/fennec.dm | 2 +- .../simple_mob/subtypes/vore/goia_ch.dm | 4 +- .../simple_mob/subtypes/vore/leopardmander.dm | 2 +- .../subtypes/vore/leopardmander_ch.dm | 4 +- .../simple_mob/subtypes/vore/macrophage.dm | 2 +- .../simple_mob/subtypes/vore/morph/morph.dm | 2 +- .../living/simple_mob/subtypes/vore/rat.dm | 2 +- .../vore/shadekin/rakshasa_abilities.dm | 2 +- .../subtypes/vore/shadekin/shadekin.dm | 2 +- .../simple_mob/subtypes/vore/softdog.dm | 2 +- .../simple_mob/subtypes/vore/vampire.dm | 2 +- .../simple_mob/subtypes/vore/vore_hostile.dm | 2 +- code/modules/mob/living/voice/voice.dm | 2 +- .../living/zz_ballistics_ch/bullet_act_ch.dm | 2 +- code/modules/mob/mob_planes.dm | 6 +- code/modules/mob/new_player/login.dm | 2 +- .../modular_computers/NTNet/NTNet_relay.dm | 2 +- .../computers/modular_computer/core.dm | 2 +- .../modular_computers/file_system/data.dm | 2 +- code/modules/multiz/basic.dm | 4 +- code/modules/multiz/ladders.dm | 2 +- code/modules/multiz/stairs.dm | 10 +- code/modules/multiz/turf.dm | 4 +- code/modules/nifsoft/nif_softshop.dm | 2 +- code/modules/organs/internal/augment.dm | 2 +- .../organs/internal/augment/armmounted.dm | 2 +- code/modules/organs/internal/spleen.dm | 2 +- code/modules/organs/internal/stomach.dm | 2 +- code/modules/organs/robolimbs.dm | 2 +- code/modules/organs/subtypes/diona.dm | 2 +- code/modules/organs/subtypes/nano.dm | 2 +- code/modules/organs/subtypes/skrell.dm | 4 +- code/modules/organs/subtypes/slime.dm | 2 +- code/modules/organs/subtypes/standard.dm | 2 +- code/modules/overmap/disperser/disperser.dm | 2 +- .../overmap/disperser/disperser_console.dm | 2 +- code/modules/overmap/events/overmap_event.dm | 2 +- code/modules/overmap/overmap_object.dm | 2 +- code/modules/overmap/overmap_planet.dm | 2 +- code/modules/overmap/overmap_shuttle.dm | 2 +- code/modules/overmap/sectors.dm | 2 +- code/modules/overmap/ships/computers/helm.dm | 4 +- .../overmap/ships/engines/gas_thruster.dm | 2 +- .../overmap/ships/engines/ion_thruster.dm | 4 +- code/modules/overmap/ships/ship.dm | 2 +- code/modules/overmap/ships/ship_vr.dm | 2 +- code/modules/overmap/spacetravel.dm | 2 +- code/modules/overmap/turfs.dm | 4 +- code/modules/paperwork/adminpaper.dm | 4 +- code/modules/paperwork/filingcabinet.dm | 2 +- code/modules/paperwork/paper_sticky.dm | 4 +- code/modules/paperwork/paperplane.dm | 2 +- code/modules/paperwork/papershredder.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/paperwork/photocopier.dm | 2 +- code/modules/pda/cart.dm | 4 +- code/modules/pda/cart_vr.dm | 2 +- code/modules/pda/pda.dm | 2 +- code/modules/pda/radio.dm | 4 +- code/modules/persistence/filth.dm | 2 +- code/modules/persistence/noticeboard.dm | 4 +- code/modules/persistence/noticeboard_yw.dm | 14 +- code/modules/planet/virgo3c_vr.dm | 2 +- code/modules/power/batteryrack_vr.dm | 2 +- code/modules/power/breaker_box.dm | 4 +- code/modules/power/cable.dm | 10 +- code/modules/power/cell.dm | 2 +- code/modules/power/cells/device_cells.dm | 6 +- code/modules/power/cells/power_cells.dm | 4 +- code/modules/power/fusion/core/_core.dm | 4 +- .../fusion/fuel_assembly/fuel_assembly.dm | 2 +- .../fusion/fuel_assembly/fuel_assembly_ch.dm | 4 +- .../fusion/fuel_assembly/fuel_compressor.dm | 2 +- .../fusion/fuel_assembly/fuel_injector.dm | 2 +- .../modules/power/fusion/gyrotron/gyrotron.dm | 2 +- code/modules/power/generator.dm | 3 +- code/modules/power/gravitygenerator.dm | 4 +- code/modules/power/gravitygenerator_vr.dm | 4 +- code/modules/power/grid_checker.dm | 2 +- code/modules/power/lighting_vr.dm | 4 +- code/modules/power/port_gen.dm | 2 +- code/modules/power/port_gen_vr.dm | 10 +- code/modules/power/privacy_switch.dm | 2 +- code/modules/power/sensors/powernet_sensor.dm | 2 +- .../power/singularity/containment_field.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- code/modules/power/singularity/emitter_vr.dm | 3 +- .../particle_accelerator/particle_smasher.dm | 2 +- code/modules/power/smes.dm | 2 +- code/modules/power/smes_construction.dm | 6 +- code/modules/power/solar.dm | 2 +- code/modules/power/supermatter/supermatter.dm | 2 +- code/modules/power/tesla/coil.dm | 2 +- code/modules/power/tesla/energy_ball.dm | 2 +- code/modules/power/turbine.dm | 6 +- code/modules/projectiles/ammunition/rounds.dm | 2 +- code/modules/projectiles/broken.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- .../projectiles/guns/energy/bsharpoon_vr.dm | 2 +- .../guns/energy/cell_loaded_vr/cell_loaded.dm | 2 +- .../guns/energy/kinetic_accelerator_vr.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 2 +- .../projectiles/guns/energy/laser_ch.dm | 2 +- .../projectiles/guns/energy/special.dm | 2 +- code/modules/projectiles/guns/magic.dm | 2 +- .../modules/projectiles/guns/magnetic/bore.dm | 4 +- .../projectiles/guns/magnetic/magnetic.dm | 2 +- .../guns/magnetic/magnetic_railgun_ch.dm | 2 +- .../projectiles/guns/projectile/automatic.dm | 2 +- .../projectiles/guns/projectile/smartgun.dm | 2 +- .../guns/projectile/zz_ballistics_ch.dm | 20 +- code/modules/projectiles/projectile/arc.dm | 2 +- .../projectiles/projectile/magnetic.dm | 2 +- code/modules/reagents/hoses/connector.dm | 6 +- .../reagents/machinery/dispenser/cartridge.dm | 2 +- .../machinery/dispenser/dispenser2.dm | 2 +- .../machinery/dispenser/reagent_tank.dm | 30 +- .../machinery/dispenser/reagent_tank_ch.dm | 2 +- code/modules/reagents/machinery/distillery.dm | 2 +- code/modules/reagents/machinery/grinder.dm | 2 +- .../reagents/machinery/injector_maker.dm | 2 +- code/modules/reagents/machinery/pump.dm | 2 +- .../reagents/reagent_containers/blood_pack.dm | 6 +- .../reagents/reagent_containers/borghypo.dm | 2 +- .../reagents/reagent_containers/glass.dm | 4 +- .../reagents/reagent_containers/hypospray.dm | 6 +- .../reagents/reagent_containers/pill.dm | 60 +- .../reagents/reagent_containers/pill_vr.dm | 30 +- .../reagents/reagent_containers/spray.dm | 14 +- .../reagents/reagent_containers/syringes.dm | 14 +- .../reagents/reagent_containers/virology.dm | 12 +- code/modules/reagents/reagents/other_ch.dm | 4 +- code/modules/recycling/conveyor2.dm | 2 +- code/modules/recycling/disposal.dm | 8 +- code/modules/recycling/recycling.dm | 2 +- code/modules/recycling/sortingmachinery.dm | 2 +- code/modules/research/circuitprinter.dm | 2 +- code/modules/research/destructive_analyzer.dm | 2 +- code/modules/research/protolathe.dm | 2 +- code/modules/research/rdconsole.dm | 2 +- code/modules/research/server.dm | 4 +- code/modules/resleeving/computers.dm | 2 +- code/modules/resleeving/designer.dm | 2 +- code/modules/resleeving/implant.dm | 2 +- code/modules/resleeving/machines.dm | 2 +- code/modules/rogueminer_vr/zone_console.dm | 2 +- code/modules/samples/container.dm | 4 +- code/modules/shieldgen/directional_shield.dm | 2 +- code/modules/shieldgen/handheld_defuser.dm | 2 +- code/modules/shieldgen/shield_diffuser.dm | 2 +- code/modules/shieldgen/shield_gen.dm | 2 +- code/modules/shieldgen/shield_generator.dm | 2 +- code/modules/shuttles/landmarks.dm | 8 +- code/modules/shuttles/shuttles_web.dm | 4 +- code/modules/stockmarket/computer.dm | 2 +- code/modules/tables/presets_vr.dm | 4 +- code/modules/tables/tables.dm | 2 +- code/modules/telesci/gps_advanced.dm | 2 +- code/modules/telesci/quantum_pad.dm | 2 +- code/modules/telesci/telesci_computer.dm | 2 +- code/modules/turbolift/turbolift_map.dm | 2 +- code/modules/vehicles/Securitrain_vr.dm | 2 +- code/modules/vehicles/bike.dm | 6 +- code/modules/vehicles/boat.dm | 24 +- code/modules/vehicles/cargo_train.dm | 2 +- code/modules/vehicles/construction.dm | 2 +- code/modules/vehicles/quad.dm | 2 +- code/modules/vehicles/rover_vr.dm | 2 +- code/modules/vehicles/snowmobile.dm | 6 +- code/modules/vehicles/train.dm | 2 +- code/modules/vehicles/vehicle.dm | 2 +- code/modules/vore/eating/belly_obj_vr.dm | 2 +- .../vore/fluffstuff/custom_boxes_vr.dm | 6 +- .../vore/fluffstuff/custom_clothes_vr.dm | 2 +- .../vore/fluffstuff/custom_implants_vr.dm | 10 +- .../vore/fluffstuff/custom_items_vr.dm | 20 +- .../vore/fluffstuff/custom_items_yw.dm | 2 +- .../vore/fluffstuff/custom_mecha_vr.dm | 2 +- code/modules/vore/resizing/crackers.dm | 4 +- code/modules/vore/resizing/sizegun_vr.dm | 2 +- .../xenoarcheaology/anomaly_container.dm | 3 +- .../xenoarcheaology/artifacts/crystal.dm | 2 +- code/modules/xenoarcheaology/boulder.dm | 2 +- .../finds/Weapons/archeo_melee.dm | 2 +- code/modules/xenoarcheaology/finds/misc.dm | 2 +- code/modules/xenoarcheaology/finds/special.dm | 2 +- code/modules/xenoarcheaology/misc.dm | 2 +- code/modules/xenoarcheaology/sampling.dm | 2 +- .../tools/artifact_analyser.dm | 2 +- .../tools/artifact_harvester.dm | 2 +- .../xenoarcheaology/tools/artifact_scanner.dm | 2 +- .../xenoarcheaology/tools/coolant_tank.dm | 2 +- .../tools/suspension_generator.dm | 2 +- code/modules/xenobio/items/extracts_vr.dm | 2 +- code/modules/xenobio/items/slime_objects.dm | 6 +- code/modules/xenobio/items/weapons.dm | 2 +- .../xenobio2/machinery/core_extractor.dm | 2 +- .../xenobio2/machinery/gene_manipulators.dm | 4 +- code/modules/xenobio2/machinery/injector.dm | 2 +- .../xenobio2/machinery/slime_replicator.dm | 2 +- maps/common/common_things.dm | 407 ++++++++++++ maps/common/common_turfs.dm | 199 ++++++ maps/expedition_vr/aerostat/_aerostat.dm | 2 +- .../aerostat/_aerostat_science_outpost.dm | 4 +- maps/expedition_vr/alienship/_alienship.dm | 2 +- maps/expedition_vr/beach/_beach.dm | 8 +- maps/expedition_vr/space/_debrisfield.dm | 16 +- maps/groundbase/groundbase_telecomms.dm | 2 +- maps/groundbase/groundbase_things.dm | 9 +- maps/offmap_vr/common_offmaps.dm | 4 +- maps/offmap_vr/talon/talon_v2.dm | 2 +- maps/redgate/falls/atoll_decals.dm | 6 +- maps/redgate/falls/atoll_objs.dm | 8 +- maps/redgate/falls/atoll_turfs.dm | 8 +- maps/redgate/fantasy_items.dm | 2 +- .../stellar_delight_defines.dm | 46 ++ .../stellar_delight_shuttle_defs.dm | 2 +- .../stellar_delight_telecomms.dm | 2 +- .../stellar_delight/stellar_delight_things.dm | 6 +- maps/submaps/_helpers.dm | 2 +- .../admin_use_vr/event_autonomous_drone.dm | 4 +- maps/submaps/admin_use_vr/fun.dm | 4 +- maps/submaps/admin_use_vr/guttersite.dm | 2 +- maps/submaps/engine_submaps/engine.dm | 2 +- maps/tether/submaps/_tether_submaps.dm | 2 +- .../underdark_pois/underdark_things.dm | 2 +- maps/tether/tether_phoronlock.dm | 4 +- maps/tether/tether_telecomms.dm | 2 +- maps/tether/tether_things.dm | 22 +- maps/tether/tether_turfs.dm | 11 +- maps/tether_better/tether_things.dm | 10 +- maps/yw/cryogaia_telecomms.dm | 6 +- maps/yw/cryogaia_things.dm | 8 +- maps/yw/cryogaia_turfs.dm | 11 +- maps/yw/structures/closets/engineering.dm | 2 +- maps/yw/structures/closets/medical.dm | 2 +- maps/yw/structures/closets/misc.dm | 6 +- maps/yw/structures/closets/misc_vr.dm | 2 +- maps/yw/structures/closets/security.dm | 2 +- maps/yw/submaps/_cryogaia_submaps.dm | 4 +- maps/yw/submaps/aerostat/_aerostat.dm | 2 +- maps/yw/submaps/alienship/_alienship.dm | 4 +- .../submaps/rogue_mines/groundbase_things.dm | 9 +- maps/yw/submaps/space/_debrisfield.dm | 4 +- maps/yw/submaps/space/_guttersite.dm | 2 +- .../underdark_pois/underdark_things.dm | 6 +- maps/yw/tether_phoronlock.dm | 4 +- .../code/datums/components/hearer.dm | 16 +- .../code/game/machinery/food_replicator.dm | 2 +- .../machinery/virtual_reality/vr_console.dm | 6 +- .../code/game/objects/effects/explosion.dm | 5 +- .../game/objects/items/devices/flipper.dm | 4 +- .../objects/items/weapons/storage/firstaid.dm | 23 +- .../code/game/objects/random/mapping.dm | 4 +- .../crate_lockers/closets/secure/security.dm | 14 +- .../structures/crate_lockers/largecrate.dm | 4 +- .../game/objects/structures/watercloset_ch.dm | 4 +- .../code/game/turfs/simulated/alien.dm | 4 +- .../modules/clothing/gloves/antagonist.dm | 2 +- .../modules/exploration/tyr_tribal_gear.dm | 6 +- .../code/modules/food/food/drinks/bottle.dm | 2 +- .../code/modules/food/food/snacks/meat.dm | 8 +- modular_chomp/code/modules/halloween/items.dm | 12 +- .../code/modules/halloween/snacks.dm | 2 +- .../code/modules/mob/living/carbon/carbon.dm | 2 +- .../code/modules/mob/living/living.dm | 2 +- .../mob/living/simple_animal/aliens/synx.dm | 4 +- .../simple_mob/subtypes/animal/space/carp.dm | 4 +- .../subtypes/gateway/alchemistbee.dm | 2 +- .../simple_mob/subtypes/gateway/imperion.dm | 2 +- .../subtypes/humanoid/eclipse/eclipse.dm | 2 +- .../subtypes/humanoid/eclipse/heads.dm | 4 +- .../humanoid/starhunters/tradercode.dm | 2 +- .../subtypes/metroid/metBaseType.dm | 2 +- .../simple_mob/subtypes/metroid/metObjects.dm | 4 +- .../simple_mob/subtypes/slimess/feral.dm | 2 +- .../simple_mob/subtypes/vore/blackholemobs.dm | 10 +- .../simple_mob/subtypes/vore/greatwolf.dm | 2 +- .../simple_mob/subtypes/vore/swoopie.dm | 2 +- .../living/simple_mob/subtypes/vore/wolf.dm | 2 +- .../simple_mob/subtypes/vore/xeyakin.dm | 8 +- .../living/simple_mob/subtypes/xenomorph.dm | 4 +- .../code/modules/paperwork/filingcabinet.dm | 2 +- .../code/modules/power/cells/power_cells.dm | 4 +- .../projectiles/guns/zBallisticPort/bullet.dm | 18 +- .../dispenser/chem_synthesizer_ch.dm | 2 +- .../code/modules/recycling/v_garbosystem.dm | 2 +- .../code/modules/vore/eating/soulcatcher.dm | 2 +- modular_chomp/game/effects/spawner.dm | 4 +- .../game/machinery/bluespace_denier.dm | 2 +- .../game/objects/effects/step_triggers.dm | 4 +- .../maps/relic_base/overmap/sectors.dm | 4 +- .../maps/relic_base/relicbase_defines.dm | 12 +- .../maps/relic_base/relicbase_overrides.dm | 2 +- .../maps/relic_base/relicbase_things.dm | 2 +- .../structures/closets/engineering.dm | 2 +- .../relic_base/structures/closets/medical.dm | 2 +- .../relic_base/structures/closets/misc.dm | 6 +- .../relic_base/structures/closets/security.dm | 2 +- .../relic_base/submaps/_relicbase_submaps.dm | 4 +- .../maps/relic_base/turfs/outdoors.dm | 2 +- .../maps/soluna_nexus/overmap/sectors_sn.dm | 2 +- .../overmap/planets/kara/kara.dm | 2 +- .../overmap/planets/kara/kara_OM_only.dm | 2 +- .../overmap/planets/thor/thor.dm | 8 +- .../southern_cross/overmap/planets/tyr/tyr.dm | 2 +- .../maps/southern_cross/overmap/sectors_sc.dm | 2 +- .../southern_cross/overmap/sectors_sif.dm | 4 +- .../shuttles/crew_shuttles_ch.dm | 6 +- .../southern_cross_overrides.dm | 2 +- .../southern_cross_sif_defines.dm | 12 +- .../structures/closets/engineering.dm | 2 +- .../structures/closets/medical.dm | 2 +- .../southern_cross/structures/closets/misc.dm | 6 +- .../structures/closets/security.dm | 2 +- .../submaps/_southern_cross_submaps.dm | 4 +- .../maps/submaps/engine_submaps/engine.dm | 2 +- .../unsim_turfs/unsim_turfs_outdoors.dm | 4 +- .../unsim_turfs/unsim_turfs_tiles.dm | 2 +- .../unsim_turfs/unsim_turfs_walls.dm | 2 +- tools/ci/validate_files.sh | 6 + 888 files changed, 2876 insertions(+), 2225 deletions(-) create mode 100644 maps/common/common_things.dm create mode 100644 maps/common/common_turfs.dm diff --git a/archive/maps/cynosure/cynosure_defines.dm b/archive/maps/cynosure/cynosure_defines.dm index 4b1f73c184..18f27dfecf 100644 --- a/archive/maps/cynosure/cynosure_defines.dm +++ b/archive/maps/cynosure/cynosure_defines.dm @@ -225,13 +225,13 @@ //Teleport to Mine -/obj/effect/step_trigger/teleporter/mine/to_mining/Initialize() +/obj/effect/step_trigger/teleporter/mine/to_mining/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = 2 teleport_z = Z_LEVEL_STATION_ONE -/obj/effect/step_trigger/teleporter/mine/from_mining/Initialize() +/obj/effect/step_trigger/teleporter/mine/from_mining/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = world.maxy - 1 @@ -239,13 +239,13 @@ //Teleport to Wild -/obj/effect/step_trigger/teleporter/wild/to_wild/Initialize() +/obj/effect/step_trigger/teleporter/wild/to_wild/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = 2 teleport_z = Z_LEVEL_SURFACE_WILD -/obj/effect/step_trigger/teleporter/wild/from_wild/Initialize() +/obj/effect/step_trigger/teleporter/wild/from_wild/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = world.maxy - 1 @@ -259,37 +259,37 @@ Z_LEVEL_SURFACE_WILD ) -/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize(mapload) teleport_x = src.x - 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize(mapload) teleport_x = src.x - 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize(mapload) teleport_x = src.x + 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize(mapload) teleport_x = src.x + 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize() +/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize(mapload) teleport_x = src.x teleport_y = src.y - 4 teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize() +/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize(mapload) teleport_x = src.x teleport_y = src.y + 4 teleport_z = src.z diff --git a/archive/maps/cynosure/overmap/sectors.dm b/archive/maps/cynosure/overmap/sectors.dm index 7780e0cb0a..dcaeb864ed 100644 --- a/archive/maps/cynosure/overmap/sectors.dm +++ b/archive/maps/cynosure/overmap/sectors.dm @@ -31,14 +31,14 @@ icecaps = "icecaps" icon_state = "frozen" //CHOMP comment: Not sure what this does at the moment, but we're doing it live. -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) atmosphere = new(CELL_VOLUME) atmosphere.adjust_gas_temp(GAS_O2, MOLES_O2STANDARD, 273) atmosphere.adjust_gas_temp(GAS_N2, MOLES_N2STANDARD, 273) . = ..() -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) . = ..() docking_codes = null diff --git a/archive/maps/gateway_archive_vr/labyrinth.dm b/archive/maps/gateway_archive_vr/labyrinth.dm index 09a7f3b8e9..dabd8da0c5 100644 --- a/archive/maps/gateway_archive_vr/labyrinth.dm +++ b/archive/maps/gateway_archive_vr/labyrinth.dm @@ -117,7 +117,7 @@ wreckage = /obj/effect/decal/mecha_wreckage/honker/cluwne max_equip = 4 -/obj/mecha/combat/honker/cluwne/Initialize() +/obj/mecha/combat/honker/cluwne/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse ME.attach(src) diff --git a/archive/maps/gateway_archive_vr/wildwest.dm b/archive/maps/gateway_archive_vr/wildwest.dm index 0a652dcc77..12576b6137 100644 --- a/archive/maps/gateway_archive_vr/wildwest.dm +++ b/archive/maps/gateway_archive_vr/wildwest.dm @@ -109,7 +109,7 @@ var/triggerproc = "explode" //name of the proc thats called when the mine is triggered var/triggered = 0 -/obj/effect/meatgrinder/Initialize() +/obj/effect/meatgrinder/Initialize(mapload) icon_state = "blob" . = ..() diff --git a/archive/maps/southern_cross/overmap/sectors.dm b/archive/maps/southern_cross/overmap/sectors.dm index 145e054137..791159877b 100644 --- a/archive/maps/southern_cross/overmap/sectors.dm +++ b/archive/maps/southern_cross/overmap/sectors.dm @@ -13,14 +13,14 @@ icecaps = "icecaps" icon_state = "frozen" -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) atmosphere = new(CELL_VOLUME) atmosphere.adjust_gas_temp(GAS_O2, MOLES_O2STANDARD, 273) atmosphere.adjust_gas_temp(GAS_N2, MOLES_N2STANDARD, 273) . = ..() -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) . = ..() docking_codes = null @@ -40,6 +40,6 @@ map_z = list(Z_LEVEL_STATION_ONE, Z_LEVEL_STATION_TWO, Z_LEVEL_STATION_THREE) extra_z_levels = list(Z_LEVEL_TRANSIT) // Hopefully temporary, so arrivals announcements work. -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) . = ..() docking_codes = null diff --git a/archive/maps/southern_cross/southern_cross_defines.dm b/archive/maps/southern_cross/southern_cross_defines.dm index 7e867b19a4..d699fd76f4 100644 --- a/archive/maps/southern_cross/southern_cross_defines.dm +++ b/archive/maps/southern_cross/southern_cross_defines.dm @@ -220,13 +220,13 @@ //Teleport to Mine -/obj/effect/step_trigger/teleporter/mine/to_mining/Initialize() +/obj/effect/step_trigger/teleporter/mine/to_mining/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = 2 teleport_z = Z_LEVEL_SURFACE_MINE -/obj/effect/step_trigger/teleporter/mine/from_mining/Initialize() +/obj/effect/step_trigger/teleporter/mine/from_mining/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = world.maxy - 1 @@ -234,13 +234,13 @@ //Teleport to Wild -/obj/effect/step_trigger/teleporter/wild/to_wild/Initialize() +/obj/effect/step_trigger/teleporter/wild/to_wild/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = 2 teleport_z = Z_LEVEL_SURFACE_WILD -/obj/effect/step_trigger/teleporter/wild/from_wild/Initialize() +/obj/effect/step_trigger/teleporter/wild/from_wild/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = world.maxy - 1 @@ -253,37 +253,37 @@ Z_LEVEL_SURFACE_WILD ) -/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize(mapload) teleport_x = src.x - 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize(mapload) teleport_x = src.x - 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize(mapload) teleport_x = src.x + 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize(mapload) teleport_x = src.x + 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize() +/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize(mapload) teleport_x = src.x teleport_y = src.y - 4 teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize() +/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize(mapload) teleport_x = src.x teleport_y = src.y + 4 teleport_z = src.z diff --git a/archive/maps/southern_cross/southern_cross_overrides.dm b/archive/maps/southern_cross/southern_cross_overrides.dm index 5458cb51da..2626c72147 100644 --- a/archive/maps/southern_cross/southern_cross_overrides.dm +++ b/archive/maps/southern_cross/southern_cross_overrides.dm @@ -4,7 +4,7 @@ /mob/living/silicon/robot/platform/cargo req_access = list(access_cargo_bot) -/obj/item/card/id/platform/Initialize() +/obj/item/card/id/platform/Initialize(mapload) . = ..() access |= access_explorer access |= access_pilot diff --git a/archive/maps/southern_cross/structures/closets/engineering.dm b/archive/maps/southern_cross/structures/closets/engineering.dm index 30f22f800f..e66c96ff9d 100644 --- a/archive/maps/southern_cross/structures/closets/engineering.dm +++ b/archive/maps/southern_cross/structures/closets/engineering.dm @@ -22,7 +22,7 @@ /obj/item/taperoll/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering) -/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize() +/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else diff --git a/archive/maps/southern_cross/structures/closets/medical.dm b/archive/maps/southern_cross/structures/closets/medical.dm index 5af03b5151..3c5a9c5634 100644 --- a/archive/maps/southern_cross/structures/closets/medical.dm +++ b/archive/maps/southern_cross/structures/closets/medical.dm @@ -21,7 +21,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/shoes/white) -/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize() +/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/medic else diff --git a/archive/maps/southern_cross/structures/closets/misc.dm b/archive/maps/southern_cross/structures/closets/misc.dm index 78cc2832d0..ba833a628a 100644 --- a/archive/maps/southern_cross/structures/closets/misc.dm +++ b/archive/maps/southern_cross/structures/closets/misc.dm @@ -16,7 +16,7 @@ /obj/item/ammo_magazine/clip/c762/hunter = 9, /obj/item/gun/projectile/shotgun/pump/rifle = 2) -/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize() +/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize(mapload) if(prob(85)) starts_with += /obj/item/gun/projectile/shotgun/pump/rifle else @@ -58,7 +58,7 @@ /obj/item/cataloguer ) -/obj/structure/closet/secure_closet/explorer/Initialize() +/obj/structure/closet/secure_closet/explorer/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else @@ -129,7 +129,7 @@ /obj/item/cell/device, /obj/item/radio) -/obj/structure/closet/secure_closet/pilot/Initialize() +/obj/structure/closet/secure_closet/pilot/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else diff --git a/archive/maps/southern_cross/structures/closets/security.dm b/archive/maps/southern_cross/structures/closets/security.dm index faa07d8857..ae59c57990 100644 --- a/archive/maps/southern_cross/structures/closets/security.dm +++ b/archive/maps/southern_cross/structures/closets/security.dm @@ -22,7 +22,7 @@ /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/clothing/mask/gas/half) -/obj/structure/closet/secure_closet/hos_wardrobe/Initialize() +/obj/structure/closet/secure_closet/hos_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else diff --git a/archive/maps/submaps/depreciated_vr/talon.dm b/archive/maps/submaps/depreciated_vr/talon.dm index be4d26c5f4..68b83c6681 100644 --- a/archive/maps/submaps/depreciated_vr/talon.dm +++ b/archive/maps/submaps/depreciated_vr/talon.dm @@ -171,7 +171,7 @@ Once in open space, consider disabling nonessential power-consuming electronics item_state = "tdgreen" assignment = "Talon synthetic" -/obj/item/card/id/synthetic/talon/Initialize() +/obj/item/card/id/synthetic/talon/Initialize(mapload) . = ..() access = list(access_talon, access_synth) diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index 5c795e3887..c2c946ee45 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -24,7 +24,7 @@ density = TRUE -/obj/machinery/atmospherics/binary/circulator/Initialize() +/obj/machinery/atmospherics/binary/circulator/Initialize(mapload) . = ..() desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]." diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 36616ae721..e2ff8c0666 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -42,7 +42,7 @@ //2: Do not pass input_pressure_min //4: Do not pass output_pressure_max -/obj/machinery/atmospherics/binary/dp_vent_pump/Initialize() +/obj/machinery/atmospherics/binary/dp_vent_pump/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) @@ -58,7 +58,7 @@ /obj/machinery/atmospherics/binary/dp_vent_pump/high_volume name = "Large Dual Port Air Vent" -/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/Initialize() +/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/Initialize(mapload) . = ..() air1.volume = ATMOS_DEFAULT_VOLUME_PUMP + 800 air2.volume = ATMOS_DEFAULT_VOLUME_PUMP + 800 diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index fd1158f408..d39fc1e3be 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -27,7 +27,7 @@ var/id = null var/datum/radio_frequency/radio_connection -/obj/machinery/atmospherics/binary/passive_gate/Initialize() +/obj/machinery/atmospherics/binary/passive_gate/Initialize(mapload) . = ..() air1.volume = ATMOS_DEFAULT_VOLUME_PUMP * 2.5 air2.volume = ATMOS_DEFAULT_VOLUME_PUMP * 2.5 diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index a79d3b65da..e45848da9b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -235,7 +235,7 @@ var/kin_to_el_ratio = 0.1 //How much kinetic energy will be taken from turbine and converted into electricity var/obj/machinery/atmospherics/pipeturbine/turbine -/obj/machinery/power/turbinemotor/Initialize() +/obj/machinery/power/turbinemotor/Initialize(mapload) . = ..() updateConnection() diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index af86077562..aa1f9a2728 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -37,7 +37,7 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection -/obj/machinery/atmospherics/binary/pump/Initialize() +/obj/machinery/atmospherics/binary/pump/Initialize(mapload) . = ..() air1.volume = ATMOS_DEFAULT_VOLUME_PUMP diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm index 4d442b772a..f848f9f50d 100644 --- a/code/ATMOSPHERICS/components/omni_devices/filter.dm +++ b/code/ATMOSPHERICS/components/omni_devices/filter.dm @@ -20,7 +20,7 @@ var/list/filtering_outputs = list() //maps gasids to gas_mixtures -/obj/machinery/atmospherics/omni/atmos_filter/Initialize() +/obj/machinery/atmospherics/omni/atmos_filter/Initialize(mapload) . = ..() rebuild_filtering_list() diff --git a/code/ATMOSPHERICS/components/omni_devices/mixer.dm b/code/ATMOSPHERICS/components/omni_devices/mixer.dm index 9d0b9c78f7..69bf177fbc 100644 --- a/code/ATMOSPHERICS/components/omni_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/omni_devices/mixer.dm @@ -24,7 +24,7 @@ var/list/mixing_inputs = list() -/obj/machinery/atmospherics/omni/mixer/Initialize() +/obj/machinery/atmospherics/omni/mixer/Initialize(mapload) . = ..() if(mapper_set()) diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index a2052662b0..135d65016a 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -25,7 +25,7 @@ var/list/ports = new() -/obj/machinery/atmospherics/omni/Initialize() +/obj/machinery/atmospherics/omni/Initialize(mapload) . = ..() icon_state = "base" diff --git a/code/ATMOSPHERICS/components/shutoff.dm b/code/ATMOSPHERICS/components/shutoff.dm index 2084b8c901..55d1162777 100644 --- a/code/ATMOSPHERICS/components/shutoff.dm +++ b/code/ATMOSPHERICS/components/shutoff.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(shutoff_valves) . = ..() . += "The automatic shutoff circuit is [close_on_leaks ? "enabled" : "disabled"]." -/obj/machinery/atmospherics/valve/shutoff/Initialize() +/obj/machinery/atmospherics/valve/shutoff/Initialize(mapload) . = ..() open() GLOB.shutoff_valves += src diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 9b28c49836..3f9317c1cf 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -39,7 +39,7 @@ if(frequency) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) -/obj/machinery/atmospherics/trinary/atmos_filter/Initialize() +/obj/machinery/atmospherics/trinary/atmos_filter/Initialize(mapload) . = ..() switch(filter_type) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 476394cb25..e76af3809d 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -37,7 +37,7 @@ icon_state += "off" update_use_power(USE_POWER_OFF) -/obj/machinery/atmospherics/trinary/mixer/Initialize() +/obj/machinery/atmospherics/trinary/mixer/Initialize(mapload) . = ..() air1.volume = ATMOS_DEFAULT_VOLUME_MIXER diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 0c2031348c..83af58bb64 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -17,7 +17,7 @@ var/datum/pipe_network/network2 var/datum/pipe_network/network3 -/obj/machinery/atmospherics/trinary/Initialize() +/obj/machinery/atmospherics/trinary/Initialize(mapload) . = ..() air1 = new diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 9f0f220ec2..df44e35574 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -302,7 +302,7 @@ -/obj/machinery/atmospherics/tvalve/digital/Initialize() +/obj/machinery/atmospherics/tvalve/digital/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index 5dd984a0ff..bf88cb248d 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -21,7 +21,7 @@ var/set_temperature = T20C // Thermostat var/cooling = 0 -/obj/machinery/atmospherics/unary/freezer/Initialize() +/obj/machinery/atmospherics/unary/freezer/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index 71e4e9c022..f3c2912e7b 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -21,7 +21,7 @@ var/set_temperature = T20C //thermostat var/heating = 0 //mainly for icon updates -/obj/machinery/atmospherics/unary/heater/Initialize() +/obj/machinery/atmospherics/unary/heater/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index 57144148fd..410f5963b7 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -24,7 +24,7 @@ level = 1 -/obj/machinery/atmospherics/unary/outlet_injector/Initialize() +/obj/machinery/atmospherics/unary/outlet_injector/Initialize(mapload) . = ..() air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 500 //Give it a small reservoir for injecting. Also allows it to have a higher flow rate limit than vent pumps, to differentiate injectors a bit more. diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index 0c6e789829..e6c28e4428 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -13,7 +13,7 @@ var/welded = 0 //defining this here for ventcrawl stuff -/obj/machinery/atmospherics/unary/Initialize() +/obj/machinery/atmospherics/unary/Initialize(mapload) . = ..() air_contents = new diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 5ab04a30a4..f8d16f14d2 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -78,7 +78,7 @@ pressure_checks = 2 pressure_checks_default = 2 -/obj/machinery/atmospherics/unary/vent_pump/Initialize() +/obj/machinery/atmospherics/unary/vent_pump/Initialize(mapload) . = ..() air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP @@ -116,7 +116,7 @@ icon_connect_type = "-aux" connect_types = CONNECT_TYPE_AUX //connects to aux pipes -/obj/machinery/atmospherics/unary/vent_pump/high_volume/Initialize() +/obj/machinery/atmospherics/unary/vent_pump/high_volume/Initialize(mapload) . = ..() air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 800 @@ -141,7 +141,7 @@ power_channel = ENVIRON power_rating = 30000 //15 kW ~ 20 HP -/obj/machinery/atmospherics/unary/vent_pump/engine/Initialize() +/obj/machinery/atmospherics/unary/vent_pump/engine/Initialize(mapload) . = ..() air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 500 //meant to match air injector diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index d52225e3df..3a5de0d5ed 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -31,7 +31,7 @@ use_power = USE_POWER_IDLE icon_state = "map_scrubber_on" -/obj/machinery/atmospherics/unary/vent_scrubber/Initialize() +/obj/machinery/atmospherics/unary/vent_scrubber/Initialize(mapload) . = ..() air_contents.volume = ATMOS_DEFAULT_VOLUME_FILTER diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index d51a369529..e5d2837b51 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -263,7 +263,7 @@ if(frequency) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) -/obj/machinery/atmospherics/valve/digital/Initialize() +/obj/machinery/atmospherics/valve/digital/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) diff --git a/code/ATMOSPHERICS/pipes/he_pipes.dm b/code/ATMOSPHERICS/pipes/he_pipes.dm index 9d69f71876..d2b1a5f8e3 100644 --- a/code/ATMOSPHERICS/pipes/he_pipes.dm +++ b/code/ATMOSPHERICS/pipes/he_pipes.dm @@ -23,7 +23,7 @@ buckle_lying = 1 // BubbleWrap -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/Initialize() +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/Initialize(mapload) . = ..() // BubbleWrap END color = "#404040" //we don't make use of the fancy overlay system for colours, use this to set the default. diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm index 88cb10994e..35eb418516 100644 --- a/code/ATMOSPHERICS/pipes/manifold.dm +++ b/code/ATMOSPHERICS/pipes/manifold.dm @@ -19,7 +19,7 @@ level = 1 -/obj/machinery/atmospherics/pipe/manifold/Initialize() +/obj/machinery/atmospherics/pipe/manifold/Initialize(mapload) . = ..() alpha = 255 icon = null diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm index 3773ebce73..de31d92fd4 100644 --- a/code/ATMOSPHERICS/pipes/manifold4w.dm +++ b/code/ATMOSPHERICS/pipes/manifold4w.dm @@ -20,7 +20,7 @@ level = 1 -/obj/machinery/atmospherics/pipe/manifold4w/Initialize() +/obj/machinery/atmospherics/pipe/manifold4w/Initialize(mapload) . = ..() alpha = 255 icon = null diff --git a/code/ATMOSPHERICS/pipes/pipe_base.dm b/code/ATMOSPHERICS/pipes/pipe_base.dm index 8030d97cc9..2d2ec01aa7 100644 --- a/code/ATMOSPHERICS/pipes/pipe_base.dm +++ b/code/ATMOSPHERICS/pipes/pipe_base.dm @@ -24,7 +24,7 @@ /obj/machinery/atmospherics/pipe/drain_power() return -1 -/obj/machinery/atmospherics/pipe/Initialize() +/obj/machinery/atmospherics/pipe/Initialize(mapload) if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/simulated/shuttle/wall) || istype(get_turf(src), /turf/unsimulated/wall)) level = 1 . = ..() diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index 466e943bed..e5a029405f 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -26,7 +26,7 @@ level = 1 -/obj/machinery/atmospherics/pipe/simple/Initialize() +/obj/machinery/atmospherics/pipe/simple/Initialize(mapload) . = ..() // Pipe colors and icon states are handled by an image cache - so color and icon should diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm index 5560c5b197..5a32031b0a 100644 --- a/code/ATMOSPHERICS/pipes/tank.dm +++ b/code/ATMOSPHERICS/pipes/tank.dm @@ -18,7 +18,7 @@ pipe_flags = PIPING_DEFAULT_LAYER_ONLY density = TRUE -/obj/machinery/atmospherics/pipe/tank/Initialize() +/obj/machinery/atmospherics/pipe/tank/Initialize(mapload) icon_state = "air" . = ..() @@ -74,7 +74,7 @@ name = "Pressure Tank (Air)" icon_state = "air_map" -/obj/machinery/atmospherics/pipe/tank/air/Initialize() +/obj/machinery/atmospherics/pipe/tank/air/Initialize(mapload) air_temporary = new air_temporary.volume = volume air_temporary.temperature = T20C @@ -90,7 +90,7 @@ name = "Pressure Tank (Oxygen)" icon_state = "o2_map" -/obj/machinery/atmospherics/pipe/tank/oxygen/Initialize() +/obj/machinery/atmospherics/pipe/tank/oxygen/Initialize(mapload) air_temporary = new air_temporary.volume = volume air_temporary.temperature = T20C @@ -105,7 +105,7 @@ icon_state = "n2_map" volume = 40000 //Vorestation edit -/obj/machinery/atmospherics/pipe/tank/nitrogen/Initialize() +/obj/machinery/atmospherics/pipe/tank/nitrogen/Initialize(mapload) air_temporary = new air_temporary.volume = volume air_temporary.temperature = T20C @@ -119,7 +119,7 @@ name = "Pressure Tank (Carbon Dioxide)" icon_state = "co2_map" -/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/Initialize() +/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/Initialize(mapload) air_temporary = new air_temporary.volume = volume air_temporary.temperature = T20C @@ -134,7 +134,7 @@ icon_state = "phoron_map" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL -/obj/machinery/atmospherics/pipe/tank/phoron/Initialize() +/obj/machinery/atmospherics/pipe/tank/phoron/Initialize(mapload) air_temporary = new air_temporary.volume = volume air_temporary.temperature = T20C @@ -148,7 +148,7 @@ name = "Pressure Tank (Nitrous Oxide)" icon_state = "n2o_map" -/obj/machinery/atmospherics/pipe/tank/nitrous_oxide/Initialize() +/obj/machinery/atmospherics/pipe/tank/nitrous_oxide/Initialize(mapload) air_temporary = new air_temporary.volume = volume air_temporary.temperature = T0C diff --git a/code/__defines/_reagents_ch.dm b/code/__defines/_reagents_ch.dm index 738f306201..5fc1742725 100644 --- a/code/__defines/_reagents_ch.dm +++ b/code/__defines/_reagents_ch.dm @@ -191,6 +191,8 @@ #define REAGENT_ID_BENZILATE "benzilate" #define REAGENT_PHENETHYLAMINE "Phenethylamine" #define REAGENT_ID_PHENETHYLAMINE "phenethylamine" +#define REAGENT_XEYAKIN_BLOOD "Xeyakin Blood" +#define REAGENT_ID_XEYAKIN_BLOOD "xeyakinblood" // Phoronreagents diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 3251edc14e..2c2c5263ea 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1285,7 +1285,7 @@ var/mob/dview/dview_mob = new color = origin.color set_light(origin.light_range, origin.light_power, origin.light_color) -/mob/dview/Initialize() +/mob/dview/Initialize(mapload) . = ..() // We don't want to be in any mob lists; we're a dummy not a mob. mob_list -= src diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm index 40ccef06c9..5a2de7000b 100644 --- a/code/_onclick/hud/picture_in_picture.dm +++ b/code/_onclick/hud/picture_in_picture.dm @@ -14,7 +14,7 @@ var/list/background_mas = list() var/const/max_dimensions = 10 -/obj/screen/movable/pic_in_pic/Initialize() +/obj/screen/movable/pic_in_pic/Initialize(mapload) . = ..() make_backgrounds() @@ -170,4 +170,4 @@ /obj/screen/movable/pic_in_pic/proc/unshow_to(client/C) if(C) shown_to -= C - C.screen -= src \ No newline at end of file + C.screen -= src diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 830a87be32..9f8297b507 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -251,7 +251,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle = new layer = TURF_LAYER plane = TURF_PLANE -/obj/effect/bgstar/Initialize() +/obj/effect/bgstar/Initialize(mapload) . = ..() pixel_x += rand(-2,30) pixel_y += rand(-2,30) diff --git a/code/datums/beam.dm b/code/datums/beam.dm index 7b5b385932..0a1324bbf9 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -156,7 +156,7 @@ // 'Reactive' beam parts do something when touched or stood in. /obj/effect/ebeam/reactive -/obj/effect/ebeam/reactive/Initialize() +/obj/effect/ebeam/reactive/Initialize(mapload) START_PROCESSING(SSobj, src) return ..() diff --git a/code/datums/components/recursive_move.dm b/code/datums/components/recursive_move.dm index 3555883934..e4cd7537d1 100644 --- a/code/datums/components/recursive_move.dm +++ b/code/datums/components/recursive_move.dm @@ -113,7 +113,7 @@ /obj/item/bananapeel/testing/proc/shmove(var/atom/source, var/atom/old_loc, var/atom/new_loc) world.log << "the [source] moved from [old_loc]([old_loc.x],[old_loc.y],[old_loc.z]) to [new_loc]([new_loc.x],[new_loc.y],[new_loc.z])" -/obj/item/bananapeel/testing/Initialize() +/obj/item/bananapeel/testing/Initialize(mapload) . = ..() AddComponent(/datum/component/recursive_move) RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(shmove)) diff --git a/code/datums/repositories/decls.dm b/code/datums/repositories/decls.dm index fead498c63..93bb25cf36 100644 --- a/code/datums/repositories/decls.dm +++ b/code/datums/repositories/decls.dm @@ -1,4 +1,4 @@ -// /decl is a subtype used for singletons that should never have more than one instance +// /decl is a subtype used for singletons that should never have more than one instance // in existence at a time. If you want to use a /decl you should use a pattern like: // var/decl/somedecl/mydecl = GET_DECL(/decl/somedecl) @@ -60,7 +60,7 @@ var/repository/decls/decls_repository // Initialiozed in /datum/global_init/New( . = get_decls(subtypesof(decl_prototype)) fetched_decl_subtypes[decl_prototype] = . -/decl/proc/Initialize() +/decl/proc/Initialize(mapload) SHOULD_CALL_PARENT(TRUE) SHOULD_NOT_SLEEP(TRUE) return diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 2c81ccc466..d062a66af5 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -42,7 +42,7 @@ var/randomize = TRUE var/square_chance = 10 -/obj/item/soap/Initialize() +/obj/item/soap/Initialize(mapload) if(randomize && prob(square_chance)) icon_state = "[icon_state]-alt" . = ..() diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index ed402aff71..7811dc134c 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(areas_by_type) GLOB.areas_by_type[type] = src return ..() -/area/Initialize() +/area/Initialize(mapload) . = ..() luminosity = !(dynamic_lighting) icon_state = "" diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 3b1784a1fb..e990ebd0b8 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -75,7 +75,7 @@ var/scan_level var/precision_coeff -/obj/machinery/dna_scannernew/Initialize() +/obj/machinery/dna_scannernew/Initialize(mapload) . = ..() default_apply_parts() RefreshParts() @@ -357,7 +357,7 @@ return return -/obj/machinery/computer/scan_consolenew/Initialize() +/obj/machinery/computer/scan_consolenew/Initialize(mapload) . = ..() for(var/i=0;i<3;i++) // Traitgenes Use bodyrecords diff --git a/code/game/gamemodes/changeling/powers/armor.dm b/code/game/gamemodes/changeling/powers/armor.dm index e511c61dd7..208fd3fe02 100644 --- a/code/game/gamemodes/changeling/powers/armor.dm +++ b/code/game/gamemodes/changeling/powers/armor.dm @@ -41,7 +41,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all. canremove = FALSE -/obj/item/clothing/suit/space/changeling/Initialize() +/obj/item/clothing/suit/space/changeling/Initialize(mapload) . = ..() if(ismob(loc)) loc.visible_message(span_warning("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!"), @@ -107,7 +107,7 @@ max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE slowdown = 1.5 -/obj/item/clothing/suit/space/changeling/armored/Initialize() +/obj/item/clothing/suit/space/changeling/armored/Initialize(mapload) . = ..() if(ismob(loc)) loc.visible_message(span_warning("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!"), diff --git a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm index f31166ec0e..5e4979cb2d 100644 --- a/code/game/gamemodes/changeling/powers/fabricate_clothing.dm +++ b/code/game/gamemodes/changeling/powers/fabricate_clothing.dm @@ -269,7 +269,7 @@ var/global/list/changeling_fabricated_clothing = list( if(ismob(loc)) registered_user = loc -/obj/item/card/id/syndicate/changeling/Initialize() +/obj/item/card/id/syndicate/changeling/Initialize(mapload) . = ..() access = null diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index a4942e3133..26c6fc21d5 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -33,7 +33,7 @@ var/activation_cooldown = 30 SECONDS var/last_activation = 0 -/obj/structure/cult/pylon/Initialize() +/obj/structure/cult/pylon/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -153,7 +153,7 @@ /obj/effect/gateway/active/cult/cultify() return -/obj/effect/gateway/active/Initialize() +/obj/effect/gateway/active/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(spawn_and_qdel)), rand(30, 60) SECONDS) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 8d6c4c144b..231b284a49 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -65,7 +65,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," // self other technology - Communication rune //was other hear blood // join hide technology - stun rune. Rune color: bright pink. -/obj/effect/rune/Initialize() +/obj/effect/rune/Initialize(mapload) . = ..() blood_image = image(loc = src) blood_image.override = 1 @@ -288,7 +288,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa"," "} -/obj/item/book/tome/Initialize() +/obj/item/book/tome/Initialize(mapload) . = ..() if(!cultwords["travel"]) runerandom() diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 874dce963f..51293a9467 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -126,7 +126,7 @@ // Multiply this and the hits var to get a rough idea of how penetrating a meteor is. var/wall_power = 100 -/obj/effect/meteor/Initialize() +/obj/effect/meteor/Initialize(mapload) . = ..() z_original = z GLOB.meteor_list += src @@ -151,7 +151,7 @@ GLOB.meteor_list -= src return ..() -/obj/effect/meteor/Initialize() +/obj/effect/meteor/Initialize(mapload) . = ..() SpinAnimation() diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm index 4e8083ceb1..ff27f1e6de 100644 --- a/code/game/gamemodes/technomancer/spells/control.dm +++ b/code/game/gamemodes/technomancer/spells/control.dm @@ -76,7 +76,7 @@ continue L.ai_holder.give_target(target) -/obj/item/spell/control/Initialize() +/obj/item/spell/control/Initialize(mapload) control_overlay = image('icons/obj/spells.dmi',"controlled") return ..() diff --git a/code/game/gamemodes/technomancer/spells/insert/insert.dm b/code/game/gamemodes/technomancer/spells/insert/insert.dm index ab18c16e3f..ec28e185f8 100644 --- a/code/game/gamemodes/technomancer/spells/insert/insert.dm +++ b/code/game/gamemodes/technomancer/spells/insert/insert.dm @@ -11,7 +11,7 @@ var/obj/item/inserted_spell/inserting = null var/allow_stacking = 0 -/obj/item/spell/insert/Initialize() +/obj/item/spell/insert/Initialize(mapload) . = ..() set_light(spell_light_range, spell_light_intensity, l_color = light_color) diff --git a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm index b462a4a1c8..6cc62397ad 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm @@ -9,7 +9,7 @@ var/spell_light_intensity = 2 var/spell_light_range = 3 -/obj/item/spell/modifier/Initialize() +/obj/item/spell/modifier/Initialize(mapload) . = ..() set_light(spell_light_range, spell_light_intensity, l_color = light_color) diff --git a/code/game/gamemodes/technomancer/spells/phase_shift.dm b/code/game/gamemodes/technomancer/spells/phase_shift.dm index 7811569615..45f1986e94 100644 --- a/code/game/gamemodes/technomancer/spells/phase_shift.dm +++ b/code/game/gamemodes/technomancer/spells/phase_shift.dm @@ -15,7 +15,7 @@ cast_methods = CAST_USE aspect = ASPECT_TELE -/obj/item/spell/phase_shift/Initialize() +/obj/item/spell/phase_shift/Initialize(mapload) . = ..() set_light(3, 2, l_color = "#FA58F4") @@ -28,7 +28,7 @@ /obj/effect/phase_shift/ex_act() return -/obj/effect/phase_shift/Initialize() +/obj/effect/phase_shift/Initialize(mapload) . = ..() set_light(3, 5, l_color = "#FA58F4") START_PROCESSING(SSobj, src) diff --git a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm index 7748470f6f..b424e49bc0 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm @@ -18,7 +18,7 @@ adjust_instability(4) ..() -/obj/item/spell/spawner/darkness/Initialize() +/obj/item/spell/spawner/darkness/Initialize(mapload) . = ..() set_light(6, -20, l_color = "#FFFFFF") diff --git a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm index aae1443614..4b769f0b6b 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm @@ -14,7 +14,7 @@ aspect = ASPECT_UNSTABLE spawner_type = /obj/effect/temporary_effect/destablize -/obj/item/spell/spawner/destablize/Initialize() +/obj/item/spell/spawner/destablize/Initialize(mapload) . = ..() set_light(3, 2, l_color = "#C26DDE") @@ -36,7 +36,7 @@ var/instability_power = 5 var/instability_range = 6 -/obj/effect/temporary_effect/destablize/Initialize() +/obj/effect/temporary_effect/destablize/Initialize(mapload) . = ..() radiate_loop() diff --git a/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm b/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm index e67687aa05..0b9d6c8214 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm @@ -13,7 +13,7 @@ aspect = ASPECT_EMP spawner_type = /obj/effect/temporary_effect/pulse/pulsar -/obj/item/spell/spawner/pulsar/Initialize() +/obj/item/spell/spawner/pulsar/Initialize(mapload) . = ..() set_light(3, 2, l_color = "#2ECCFA") @@ -31,7 +31,7 @@ var/pulse_delay = 2 SECONDS var/pulsetimer -/obj/effect/temporary_effect/pulse/Initialize() +/obj/effect/temporary_effect/pulse/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm index 0563918e14..3c724a939e 100644 --- a/code/game/machinery/CableLayer.dm +++ b/code/game/machinery/CableLayer.dm @@ -8,7 +8,7 @@ var/max_cable = 100 var/on = 0 -/obj/machinery/cablelayer/Initialize() +/obj/machinery/cablelayer/Initialize(mapload) cable = new(src, max_cable) . = ..() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 12e7a94cce..8c09817767 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -15,7 +15,7 @@ clicksound = 'sound/machines/buttonbeep.ogg' clickvol = 30 -/obj/machinery/sleep_console/Initialize() +/obj/machinery/sleep_console/Initialize(mapload) findsleeper() return ..() @@ -113,7 +113,7 @@ idle_power_usage = 15 active_power_usage = 200 //builtin health analyzer, dialysis machine, injectors. -/obj/machinery/sleeper/Initialize() +/obj/machinery/sleeper/Initialize(mapload) . = ..() beaker = new /obj/item/reagent_containers/glass/beaker/large(src) default_apply_parts() @@ -539,6 +539,6 @@ icon_state = "sleeper" stasis_level = 100 //Just one setting -/obj/machinery/sleeper/survival_pod/Initialize() +/obj/machinery/sleeper/survival_pod/Initialize(mapload) . = ..() RefreshParts(1) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 5d5c2afb4d..21b12a63e8 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -17,7 +17,7 @@ var/obj/machinery/body_scanconsole/console var/printing_text = null -/obj/machinery/bodyscanner/Initialize() +/obj/machinery/bodyscanner/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index a1a4d5cddd..d3f17b92d7 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -165,7 +165,7 @@ if(name == "alarm") name = "[alarm_area.name] Air Alarm" -/obj/machinery/alarm/Initialize() +/obj/machinery/alarm/Initialize(mapload) . = ..() set_frequency(frequency) if(!master_is_operating()) diff --git a/code/game/machinery/atm_ret_field.dm b/code/game/machinery/atm_ret_field.dm index b0d8fcd6c2..08c0deca62 100644 --- a/code/game/machinery/atm_ret_field.dm +++ b/code/game/machinery/atm_ret_field.dm @@ -80,7 +80,7 @@ qdel(src) return -/obj/machinery/atmospheric_field_generator/perma/Initialize() +/obj/machinery/atmospheric_field_generator/perma/Initialize(mapload) . = ..() generate_field() @@ -159,7 +159,7 @@ isactive = FALSE return -/obj/machinery/atmospheric_field_generator/Initialize() +/obj/machinery/atmospheric_field_generator/Initialize(mapload) . = ..() //Delete ourselves if we find extra mapped in arfgs for(var/obj/machinery/atmospheric_field_generator/F in loc) @@ -213,7 +213,7 @@ return -/obj/structure/atmospheric_retention_field/Initialize() +/obj/structure/atmospheric_retention_field/Initialize(mapload) . = ..() update_nearby_tiles() //Force ZAS update update_connections(1) diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 93ac8ccda8..7e062ae943 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -64,7 +64,7 @@ frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) -/obj/machinery/air_sensor/Initialize() +/obj/machinery/air_sensor/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) @@ -130,7 +130,7 @@ frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) -/obj/machinery/computer/general_air_control/Initialize() +/obj/machinery/computer/general_air_control/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 87917af6b3..e6e260e64d 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -14,7 +14,7 @@ //Simple variable to prevent me from doing attack_hand in both this and the child computer var/zone = "This computer is working on a wireless range, the range is currently limited to " -/obj/machinery/computer/area_atmos/Initialize() +/obj/machinery/computer/area_atmos/Initialize(mapload) . = ..() scanscrubbers() diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 7e401f1da9..33f53bce24 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -415,7 +415,7 @@ update_flag update_icon() //Dirty way to fill room with gas. However it is a bit easier to do than creating some floor/engine/n2o -rastaf0 -/obj/machinery/portable_atmospherics/canister/nitrous_oxide/roomfiller/Initialize() +/obj/machinery/portable_atmospherics/canister/nitrous_oxide/roomfiller/Initialize(mapload) . = ..() air_contents.gas[GAS_N2O] = 9*4000 var/turf/simulated/location = src.loc diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index f325c5ba93..92c38482cd 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -12,7 +12,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 15 -/obj/machinery/meter/Initialize() +/obj/machinery/meter/Initialize(mapload) . = ..() if (!target) target = select_target() diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 1c1b542d15..5385b2027e 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -245,7 +245,7 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary name = "Stationary Air Scrubber" -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize() +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize(mapload) . = ..() desc += "This one seems to be tightly secured with large bolts." diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c1b372e5ad..fe2f0993ae 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -29,7 +29,7 @@ var/filtertext -/obj/machinery/autolathe/Initialize() +/obj/machinery/autolathe/Initialize(mapload) AddComponent(/datum/component/material_container, subtypesof(/datum/material), 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert))) . = ..() if(!autolathe_recipes) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 6533978b28..154e870387 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -53,7 +53,7 @@ src.reagent_amt = amt src.cost = cost -/obj/machinery/biogenerator/Initialize() +/obj/machinery/biogenerator/Initialize(mapload) . = ..() var/datum/reagents/R = new/datum/reagents(1000) reagents = R diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index d7365074e7..d67f33c431 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -100,7 +100,7 @@ add_overlay("bioprinter_working") //VOREStation Edit End -/obj/machinery/organ_printer/Initialize() +/obj/machinery/organ_printer/Initialize(mapload) . = ..() default_apply_parts() @@ -298,7 +298,7 @@ icon_state = "bioprinter" circuit = /obj/item/circuitboard/bioprinter -/obj/machinery/organ_printer/flesh/full/Initialize() +/obj/machinery/organ_printer/flesh/full/Initialize(mapload) . = ..() container = new /obj/item/reagent_containers/glass/bottle/biomass(src) @@ -365,7 +365,7 @@ var/matter_amount_per_sheet = 10 var/matter_type = MAT_STEEL -/obj/machinery/organ_printer/robot/full/Initialize() +/obj/machinery/organ_printer/robot/full/Initialize(mapload) . = ..() stored_matter = max_stored_matter diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index ac877dee7f..118138c77d 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -188,7 +188,7 @@ var/global/list/engineering_networks = list( /obj/machinery/camera/autoname var/static/list/by_area -/obj/machinery/camera/autoname/Initialize() +/obj/machinery/camera/autoname/Initialize(mapload) . = ..() var/area/A = get_area(src) if(!A) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index b33f05c16b..81154cdca0 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -13,7 +13,7 @@ var/chargelevel = -1 circuit = /obj/item/circuitboard/cell_charger -/obj/machinery/cell_charger/Initialize() +/obj/machinery/cell_charger/Initialize(mapload) . = ..() default_apply_parts() add_overlay("ccharger1") diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index aa51eb8a04..eb95d8e60d 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -49,7 +49,7 @@ var/speed_coeff var/efficiency -/obj/machinery/clonepod/Initialize() +/obj/machinery/clonepod/Initialize(mapload) . = ..() default_apply_parts() update_icon() @@ -451,7 +451,7 @@ icon_state = "pod_g" -/obj/machinery/clonepod/full/Initialize() +/obj/machinery/clonepod/full/Initialize(mapload) . = ..() for(var/i = 1 to container_limit) containers += new /obj/item/reagent_containers/glass/bottle/biomass(src) @@ -484,7 +484,7 @@ name = "Diskette Box" icon_state = "disk_kit" -/obj/item/storage/box/disks/Initialize() +/obj/item/storage/box/disks/Initialize(mapload) . = ..() new /obj/item/disk/body_record(src) new /obj/item/disk/body_record(src) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6eab2aca15..c145239480 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -101,7 +101,7 @@ var/blocked = 0 //Player cannot attack/heal while set var/turtle = 0 -/obj/machinery/computer/arcade/battle/Initialize() +/obj/machinery/computer/arcade/battle/Initialize(mapload) . = ..() randomize_characters() diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index af2dba0c14..f9aefe97d4 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -15,7 +15,7 @@ var/datum/tgui_module/camera/camera var/camera_datum_type = /datum/tgui_module/camera -/obj/machinery/computer/security/Initialize() +/obj/machinery/computer/security/Initialize(mapload) . = ..() if(!LAZYLEN(network)) network = get_default_networks() @@ -89,7 +89,7 @@ GLOBAL_LIST_EMPTY(bodycamera_screens) // CHOMPEdit var/enabled = TRUE // on or off -/obj/machinery/computer/security/telescreen/entertainment/Initialize() +/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload) GLOB.entertainment_screens += src var/static/icon/mask = icon('icons/obj/entertainment_monitor.dmi', "mask") @@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(bodycamera_screens) // CHOMPEdit var/enabled = TRUE // on or off -/obj/machinery/computer/security/telescreen/bodycamera/Initialize() +/obj/machinery/computer/security/telescreen/bodycamera/Initialize(mapload) GLOB.bodycamera_screens += src var/static/icon/mask = icon('icons/obj/entertainment_monitor.dmi', "mask") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index bd8e949e8d..461b84ee63 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -25,7 +25,7 @@ light_color = "#315ab4" -/obj/machinery/computer/cloning/Initialize() +/obj/machinery/computer/cloning/Initialize(mapload) . = ..() pods = list() records = list() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index bc272158ee..b0832d13cc 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -12,7 +12,7 @@ var/datum/tgui_module/communications/communications -/obj/machinery/computer/communications/Initialize() +/obj/machinery/computer/communications/Initialize(mapload) . = ..() communications = new(src) diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 143e7baa78..5888f75652 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -59,7 +59,7 @@ expired = 1 return ..() -/obj/item/card/id/guest/Initialize() +/obj/item/card/id/guest/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) update_icon() diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 2eaa6d6711..3c48a366a7 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -28,7 +28,7 @@ var/static/list/field_edit_choices -/obj/machinery/computer/med_data/Initialize() +/obj/machinery/computer/med_data/Initialize(mapload) . = ..() field_edit_questions = list( // General diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 9509253ede..2d18ccfe5f 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -68,7 +68,7 @@ icon_screen = initial(icon_screen) ..() -/obj/machinery/computer/message_monitor/Initialize() +/obj/machinery/computer/message_monitor/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD @@ -341,7 +341,7 @@ /obj/item/paper/monitorkey name = "Monitor Decryption Key" -/obj/item/paper/monitorkey/Initialize() +/obj/item/paper/monitorkey/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 941778b383..06a82d6cc7 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -12,7 +12,7 @@ var/time = 30.0 var/title = "Mass Driver Controls" -/obj/machinery/computer/pod/Initialize() +/obj/machinery/computer/pod/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index cf873879d0..5448841efa 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -24,7 +24,7 @@ var/static/list/field_edit_questions var/static/list/field_edit_choices -/obj/machinery/computer/secure_data/Initialize() +/obj/machinery/computer/secure_data/Initialize(mapload) . = ..() field_edit_questions = list( // General diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 2a7a732087..ff55f7777c 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -29,7 +29,7 @@ var/static/list/field_edit_questions var/static/list/field_edit_choices -/obj/machinery/computer/skills/Initialize() +/obj/machinery/computer/skills/Initialize(mapload) . = ..() field_edit_questions = list( // General diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index ae6763867f..663d1f612f 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -17,7 +17,7 @@ monitor_type = /datum/tgui_module/alarm_monitor/all circuit = /obj/item/circuitboard/stationalert_all -/obj/machinery/computer/station_alert/Initialize() +/obj/machinery/computer/station_alert/Initialize(mapload) alarm_monitor = new monitor_type(src) alarm_monitor.register_alarm(src, "update_console_icon") . = ..() diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 336fa50499..2aaf387206 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -22,7 +22,7 @@ var/obj/item/radio/intercom/announce // Integreated announcer -/obj/machinery/computer/timeclock/Initialize() +/obj/machinery/computer/timeclock/Initialize(mapload) . = ..() announce = new /obj/item/radio/intercom(src) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index c71bf80e7a..5d86fe44c9 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -33,7 +33,7 @@ icon_state = "base" initialize_directions = dir -/obj/machinery/atmospherics/unary/cryo_cell/Initialize() +/obj/machinery/atmospherics/unary/cryo_cell/Initialize(mapload) . = ..() var/image/tank = image(icon,"tank") tank.alpha = 200 diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 9bc5ddf3ae..93fa7c826a 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -290,7 +290,7 @@ time_till_despawn = 60 //1 second, because gateway. -/obj/machinery/cryopod/Initialize() +/obj/machinery/cryopod/Initialize(mapload) . = ..() announce = new /obj/item/radio/intercom(src) @@ -300,7 +300,7 @@ occupant.resting = 1 return ..() -/obj/machinery/cryopod/Initialize() +/obj/machinery/cryopod/Initialize(mapload) . = ..() find_control_computer() diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index c1343846c4..9dbace42f1 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -11,7 +11,7 @@ var/id_tag = null var/chime_sound = 'sound/machines/doorbell.ogg' -/obj/machinery/doorbell_chime/Initialize() +/obj/machinery/doorbell_chime/Initialize(mapload) . = ..() update_icon() @@ -99,7 +99,7 @@ assign_uid() id = num2text(uid) -/obj/machinery/button/doorbell/Initialize() +/obj/machinery/button/doorbell/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 59f6da530a..985994e1ee 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1553,7 +1553,7 @@ About the new airlock wires panel: else wires = new/datum/wires/airlock(src) -/obj/machinery/door/airlock/Initialize() +/obj/machinery/door/airlock/Initialize(mapload) if(src.closeOtherId != null) for (var/obj/machinery/door/airlock/A in machines) if(A.closeOtherId == src.closeOtherId && A != src) diff --git a/code/game/machinery/doors/airlock_angled_bay.dm b/code/game/machinery/doors/airlock_angled_bay.dm index 00741a1fd3..cbcea42902 100644 --- a/code/game/machinery/doors/airlock_angled_bay.dm +++ b/code/game/machinery/doors/airlock_angled_bay.dm @@ -86,7 +86,7 @@ /// Optional: If door_color_icon is not null, this color will be applied to the door color overlay var/door_color -/obj/machinery/door/airlock/angled_bay/Initialize() +/obj/machinery/door/airlock/angled_bay/Initialize(mapload) obtain_icon() . = ..() diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 783ff1b6a3..0b7751475d 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -144,7 +144,7 @@ radio_connection = radio_controller.add_object(src, new_frequency, RADIO_AIRLOCK) -/obj/machinery/door/airlock/Initialize() +/obj/machinery/door/airlock/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) @@ -224,7 +224,7 @@ frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK) -/obj/machinery/airlock_sensor/Initialize() +/obj/machinery/airlock_sensor/Initialize(mapload) . = ..() set_frequency(frequency) @@ -370,7 +370,7 @@ radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK) -/obj/machinery/access_button/Initialize() +/obj/machinery/access_button/Initialize(mapload) . = ..() set_frequency(frequency) diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index c7826577b2..399d11b1fe 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -14,7 +14,7 @@ radio_controller.remove_object(src,air_frequency) . = ..() -/obj/machinery/door/airlock/alarmlock/Initialize() +/obj/machinery/door/airlock/alarmlock/Initialize(mapload) . = ..() radio_controller.remove_object(src, air_frequency) air_connection = radio_controller.add_object(src, air_frequency, RADIO_TO_AIRALARM) diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 904388d4fa..f5f414a850 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -40,7 +40,7 @@ //turning this off prevents awkward zone geometry in places like medbay lobby, for example. block_air_zones = 0 -/obj/machinery/door/blast/Initialize() +/obj/machinery/door/blast/Initialize(mapload) . = ..() implicit_material = get_material_by_name(MAT_PLASTEEL) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index bc1e642653..cc48bbe4b5 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -36,7 +36,7 @@ maptext_height = 26 maptext_width = 32 -/obj/machinery/door_timer/Initialize() +/obj/machinery/door_timer/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index a5f6872683..2adb895d97 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -51,7 +51,7 @@ var/open_sound = 'sound/machines/firelockopen.ogg' //CHOMPEdit firedoor sound variable. var/close_sound = 'sound/machines/firelockclose.ogg' //CHOMPEdit firedoor sound variable. -/obj/machinery/door/firedoor/Initialize() +/obj/machinery/door/firedoor/Initialize(mapload) . = ..() //Delete ourselves if we find extra mapped in firedoors for(var/obj/machinery/door/firedoor/F in loc) diff --git a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm index 9e65c06bcd..44f4376dd4 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm @@ -14,7 +14,7 @@ appearance = master_controller . = ..() -/obj/machinery/dummy_airlock_controller/Initialize() +/obj/machinery/dummy_airlock_controller/Initialize(mapload) . = ..() if(id_tag) for(var/obj/machinery/embedded_controller/radio/airlock/_master in SSmachines.machinery) diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index 12df7c9aa3..2cddb1628a 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -15,7 +15,7 @@ tag_secure = 1 valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "toggle_override") -/obj/machinery/embedded_controller/radio/airlock/docking_port/Initialize() +/obj/machinery/embedded_controller/radio/airlock/docking_port/Initialize(mapload) . = ..() airlock_program = new/datum/embedded_program/airlock/docking(src) docking_program = new/datum/embedded_program/docking/airlock(src, airlock_program) @@ -172,4 +172,4 @@ set src in view(1) src.program:initiate_undocking() -*/ \ No newline at end of file +*/ diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index 1cf4e1cb3c..1321bca2b9 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -7,7 +7,7 @@ var/child_names_txt var/list/child_names = list() -/obj/machinery/embedded_controller/radio/docking_port_multi/Initialize() +/obj/machinery/embedded_controller/radio/docking_port_multi/Initialize(mapload) . = ..() var/list/names = splittext(child_names_txt, ";") var/list/tags = splittext(child_tags_txt, ";") @@ -40,7 +40,7 @@ var/master_tag //for mapping tag_secure = 1 valid_actions = list("cycle_ext", "cycle_int", "force_ext", "force_int", "abort", "toggle_override") - + /obj/machinery/embedded_controller/radio/airlock/docking_port_multi/tgui_data(mob/user) var/datum/embedded_program/airlock/multi_docking/airlock_program = program // Cast to proper type diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index c92cbdd650..7883ddfed4 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -7,7 +7,7 @@ var/list/valid_actions = list() var/on = 1 -/obj/machinery/embedded_controller/Initialize() +/obj/machinery/embedded_controller/Initialize(mapload) if(ispath(program)) program = new program(src) return ..() @@ -83,7 +83,7 @@ var/radio_filter = null var/datum/radio_frequency/radio_connection -/obj/machinery/embedded_controller/radio/Initialize() +/obj/machinery/embedded_controller/radio/Initialize(mapload) set_frequency(frequency) // Set it before parent instantiates program . = ..() diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm index 3e4261bcc7..66dbc9cc57 100644 --- a/code/game/machinery/embedded_controller/mapping_helpers.dm +++ b/code/game/machinery/embedded_controller/mapping_helpers.dm @@ -21,7 +21,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 //Most things have a radio tag of some sort that needs adjusting var/tag_addon -/obj/effect/map_helper/airlock/Initialize() +/obj/effect/map_helper/airlock/Initialize(mapload) ..() my_controller = get_controller(get_area(src)) my_device = locate(my_device_type) in get_turf(src) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index 045f390415..23d3baef88 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -23,7 +23,7 @@ // Proc: New() // Parameters: None // Description: Adds components to the machine for deconstruction. -/obj/machinery/exonet_node/Initialize() //CHOMPAdd Start +/obj/machinery/exonet_node/map/Initialize(mapload) . = ..() default_apply_parts() // CHOMPAdd: Exonet Machinery humming @@ -41,7 +41,7 @@ soundloop.start() // CHOMPStation Edit: This starts on // CHOMPAdd End -/obj/machinery/exonet_node/map/Initialize() +/obj/machinery/exonet_node/map/Initialize(mapload) . = ..() //default_apply_parts() //CHOMPEdit desc = "This machine is one of many, many nodes inside [using_map.starsys_name]'s section of the Exonet, connecting the [using_map.station_short] to the rest of the system, at least \ diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm index 6beee860fa..7eaef94df5 100644 --- a/code/game/machinery/fire_alarm.dm +++ b/code/game/machinery/fire_alarm.dm @@ -53,7 +53,7 @@ FIRE ALARM . = ..() . += "Current security level: [seclevel]" -/obj/machinery/firealarm/Initialize() +/obj/machinery/firealarm/Initialize(mapload) . = ..() if(!pixel_x && !pixel_y) offset_alarm() diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index 62947d03ae..303863aee5 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -161,7 +161,7 @@ var/list/dispenser_presets = list() to_chat(user, span_warning("Your moral standards prevent you from emagging this machine!")) return -1 // Letting people emag this one would be bad times -/obj/machinery/gear_dispenser/Initialize() +/obj/machinery/gear_dispenser/Initialize(mapload) . = ..() if(!gear_distributed_to["[type]"] && (dispenser_flags & GD_NOGREED)) gear_distributed_to["[type]"] = list() @@ -391,7 +391,7 @@ var/list/dispenser_presets = list() /obj/machinery/gear_dispenser/custom name = "personal gear dispenser" -/obj/machinery/gear_dispenser/custom/Initialize() +/obj/machinery/gear_dispenser/custom/Initialize(mapload) dispenses = subtypesof(/datum/gear_disp/custom) . = ..() @@ -874,7 +874,7 @@ var/list/dispenser_presets = list() ) var/chance_to_delete = 0 -/obj/machinery/gear_dispenser/adventure_box/Initialize() +/obj/machinery/gear_dispenser/adventure_box/Initialize(mapload) . = ..() if(prob(chance_to_delete)) return INITIALIZE_HINT_QDEL diff --git a/code/game/machinery/holoposter.dm b/code/game/machinery/holoposter.dm index 4f76a3a66d..dd84e6e64c 100644 --- a/code/game/machinery/holoposter.dm +++ b/code/game/machinery/holoposter.dm @@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(holoposters) "moebius" = list(LIGHT_COLOR_PURPLE, "Moebius. One of the few companies worth merit beyond their local bubble staffed completely by synthetics. 'For synths, by synths.'") ) -/obj/machinery/holoposter/Initialize() +/obj/machinery/holoposter/Initialize(mapload) . = ..() set_rand_sprite() GLOB.holoposters += src diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index be006ccb25..bcffdd9232 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -29,7 +29,7 @@ //VOREStation Add End var/datum/track/current_track -/obj/machinery/media/jukebox/Initialize() +/obj/machinery/media/jukebox/Initialize(mapload) . = ..() default_apply_parts() wires = new/datum/wires/jukebox(src) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 29174f7e74..713ef06e3c 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -18,7 +18,7 @@ var/otherarea = null var/image/overlay -/obj/machinery/light_switch/Initialize() +/obj/machinery/light_switch/Initialize(mapload) . = ..() area = get_area(src) @@ -96,4 +96,3 @@ icon = 'icons/obj/power_breaker.dmi' icon_state = "light1" on = 0 - diff --git a/code/game/machinery/machinery_power.dm b/code/game/machinery/machinery_power.dm index d2e178aded..c09267b2e4 100644 --- a/code/game/machinery/machinery_power.dm +++ b/code/game/machinery/machinery_power.dm @@ -74,7 +74,7 @@ var/recursive_set = FALSE //CHOMPEdit: bool to indicate if recursive movement detection ever got set. If it did, don't try to set it again! // Do not do power stuff in New/Initialize until after ..() -/obj/machinery/Initialize() +/obj/machinery/Initialize(mapload) . = ..() //ChompEDIT START -- only add this if we init on a non-turf (and non-null) diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index 22e986dd4c..85c55fbf8f 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -40,7 +40,7 @@ /// This determines if the kiosk can dispense or not. Edit the below line to FALSE if you don't want them to do such. var/can_dispense = TRUE -/obj/machinery/medical_kiosk/Initialize() +/obj/machinery/medical_kiosk/Initialize(mapload) . = ..() our_db = SStranscore.db_by_key(db_key) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 43c0993aa4..9264856b12 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -171,7 +171,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster) name = "Security Newscaster" securityCaster = 1 -/obj/machinery/newscaster/Initialize() +/obj/machinery/newscaster/Initialize(mapload) ..() GLOB.allCasters += src unit_no = ++unit_no_cur diff --git a/code/game/machinery/oxygen_pump.dm b/code/game/machinery/oxygen_pump.dm index 251fd3111c..11f02ec593 100644 --- a/code/game/machinery/oxygen_pump.dm +++ b/code/game/machinery/oxygen_pump.dm @@ -19,7 +19,7 @@ idle_power_usage = 10 active_power_usage = 120 // No idea what the realistic amount would be. -/obj/machinery/oxygen_pump/Initialize() +/obj/machinery/oxygen_pump/Initialize(mapload) . = ..() tank = new spawn_type (src) contained = new mask_type (src) diff --git a/code/game/machinery/pda_multicaster.dm b/code/game/machinery/pda_multicaster.dm index 1f86d0d8e5..10b70b6d20 100644 --- a/code/game/machinery/pda_multicaster.dm +++ b/code/game/machinery/pda_multicaster.dm @@ -26,9 +26,6 @@ "cargo" = new /obj/item/pda/multicaster/cargo(src), "civilian" = new /obj/item/pda/multicaster/civilian(src)) -/obj/machinery/pda_multicaster/Initialize() - . = ..() - // CHOMPAdd: PDA Multicaster Server humming soundloop = new(list(src), FALSE) if(prob(60)) // 60% chance to change the midloop @@ -44,7 +41,7 @@ soundloop.start() // Have to do this here bc it starts on // CHOMPAdd End -/obj/machinery/pda_multicaster/prebuilt/Initialize() +/obj/machinery/pda_multicaster/prebuilt/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm index 515c32063c..95cdb4340f 100644 --- a/code/game/machinery/pointdefense.dm +++ b/code/game/machinery/pointdefense.dm @@ -143,7 +143,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense) var/id_tag = null var/fire_sounds = list('sound/weapons/frigate_turret/frigate_turret_fire1.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire2.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire3.ogg', 'sound/weapons/frigate_turret/frigate_turret_fire4.ogg') // CHOMPEdit: Pew -/obj/machinery/pointdefense/Initialize() +/obj/machinery/power/pointdefense/Initialize(mapload) . = ..() // TODO - Remove this bit once machines are converted to Initialize if(ispath(circuit)) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index c7a0381afb..9676ff1426 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -274,7 +274,7 @@ ) return data -/obj/machinery/porta_turret/Initialize() +/obj/machinery/porta_turret/Initialize(mapload) //Sets up a spark system spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) diff --git a/code/game/machinery/protean_reconstitutor.dm b/code/game/machinery/protean_reconstitutor.dm index 30aeec0325..5fef0e960c 100644 --- a/code/game/machinery/protean_reconstitutor.dm +++ b/code/game/machinery/protean_reconstitutor.dm @@ -33,7 +33,7 @@ //component vars circuit = /obj/item/circuitboard/protean_reconstitutor -/obj/machinery/protean_reconstitutor/Initialize() +/obj/machinery/protean_reconstitutor/Initialize(mapload) component_parts = list() component_parts += new /obj/item/stock_parts/matter_bin(src) component_parts += new /obj/item/stock_parts/manipulator(src) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 0c8f5485fd..9bf6e18976 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -17,7 +17,7 @@ var/portable = 1 circuit = /obj/item/circuitboard/recharger -/obj/machinery/recharger/Initialize() +/obj/machinery/recharger/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 0fec0b1218..4df6d8802a 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -23,7 +23,7 @@ var/weld_power_use = 2300 // power used per point of brute damage repaired. 2.3 kW ~ about the same power usage of a handheld arc welder var/wire_power_use = 500 // power used per point of burn damage repaired. -/obj/machinery/recharge_station/Initialize() +/obj/machinery/recharge_station/Initialize(mapload) . = ..() default_apply_parts() cell = default_use_hicell() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 70ab58035e..db0714246c 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -54,7 +54,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() light_range = 0 var/datum/announcement/announcement = new -/obj/machinery/requests_console/Initialize() +/obj/machinery/requests_console/Initialize(mapload) . = ..() announcement.title = "[department] announcement" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index d56f24d06f..706a2f4939 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -65,7 +65,7 @@ return // register for radio system -/obj/machinery/status_display/Initialize() +/obj/machinery/status_display/Initialize(mapload) . = ..() if(radio_controller) radio_controller.add_object(src, frequency) diff --git a/code/game/machinery/suit_dispenser.dm b/code/game/machinery/suit_dispenser.dm index 30cd935bd4..4cd7d549ac 100644 --- a/code/game/machinery/suit_dispenser.dm +++ b/code/game/machinery/suit_dispenser.dm @@ -161,7 +161,7 @@ var/list/dispenser_presets = list() to_chat(user, span_warning("Your moral standards prevent you from emagging this machine!")) return -1 // Letting people emag this one would be bad times -/obj/machinery/gear_dispenser/Initialize() +/obj/machinery/gear_dispenser/Initialize(mapload) . = ..() if(!gear_distributed_to["[type]"] && (dispenser_flags & GD_NOGREED)) gear_distributed_to["[type]"] = list() @@ -297,7 +297,7 @@ var/list/dispenser_presets = list() /obj/machinery/gear_dispenser/custom name = "personal gear dispenser" -/obj/machinery/gear_dispenser/custom/Initialize() +/obj/machinery/gear_dispenser/custom/Initialize(mapload) dispenses = subtypesof(/datum/gear_disp/custom) . = ..() diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm index eda767057a..1479391e03 100644 --- a/code/game/machinery/suit_storage/suit_cycler.dm +++ b/code/game/machinery/suit_storage/suit_cycler.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) var/datum/wires/suit_storage_unit/wires = null -/obj/machinery/suit_cycler/Initialize() +/obj/machinery/suit_cycler/Initialize(mapload) . = ..() departments = load_departments() diff --git a/code/game/machinery/suit_storage/suit_storage.dm b/code/game/machinery/suit_storage/suit_storage.dm index fcb0a408e0..c51176e7c1 100644 --- a/code/game/machinery/suit_storage/suit_storage.dm +++ b/code/game/machinery/suit_storage/suit_storage.dm @@ -26,7 +26,7 @@ var/safetieson = 1 var/cycletime_left = 0 -/obj/machinery/suit_storage_unit/Initialize() +/obj/machinery/suit_storage_unit/Initialize(mapload) . = ..() if(suit_type) SUIT = new suit_type(src) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 786cc2bbd7..778ffcea13 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -30,7 +30,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //Linked bluespace radios var/list/linked_radios_weakrefs = list() -/obj/machinery/telecomms/processor/Initialize() +/obj/machinery/telecomms/processor/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/machinery/telecrystal_storage_ch.dm b/code/game/machinery/telecrystal_storage_ch.dm index 32d2935e02..e7de2eb233 100644 --- a/code/game/machinery/telecrystal_storage_ch.dm +++ b/code/game/machinery/telecrystal_storage_ch.dm @@ -84,7 +84,7 @@ icon_state = "x4" var/amount_to_spawn = 5 -/obj/tcspawner/Initialize() +/obj/tcspawner/Initialize(mapload) ..() var/turf/T = get_turf(src) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index b3c2bf95bd..6f5d9cfa66 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -19,7 +19,7 @@ underlays.Cut() underlays += image('icons/obj/stationobjs_vr.dmi', icon_state = "telecomp-wires") //VOREStation Edit: different direction for wires to account for dirs -/obj/machinery/computer/teleporter/Initialize() +/obj/machinery/computer/teleporter/Initialize(mapload) . = ..() teleport_control = new(src) var/obj/machinery/teleport/station/station = null @@ -142,7 +142,7 @@ circuit = /obj/item/circuitboard/teleporter_hub var/obj/machinery/computer/teleporter/com -/obj/machinery/teleport/hub/Initialize() +/obj/machinery/teleport/hub/Initialize(mapload) . = ..() underlays += image('icons/obj/stationobjs.dmi', icon_state = "tele-wires") default_apply_parts() @@ -210,7 +210,7 @@ circuit = /obj/item/circuitboard/teleporter_station var/obj/machinery/teleport/hub/com -/obj/machinery/teleport/station/Initialize() +/obj/machinery/teleport/station/Initialize(mapload) . = ..() add_overlay("controller-wires") default_apply_parts() diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 0fa6760166..c9d70a78f8 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -50,7 +50,7 @@ A.turret_controls -= src ..() -/obj/machinery/turretid/Initialize() +/obj/machinery/turretid/Initialize(mapload) if(!control_area) control_area = get_area(src) else if(ispath(control_area)) diff --git a/code/game/machinery/virtual_reality/ar_console.dm b/code/game/machinery/virtual_reality/ar_console.dm index aed2bcb7a2..24191d3373 100644 --- a/code/game/machinery/virtual_reality/ar_console.dm +++ b/code/game/machinery/virtual_reality/ar_console.dm @@ -16,7 +16,7 @@ var/randomize_species = FALSE var/list/possible_species // Do we make the newly produced body a random species? -/obj/machinery/vr_sleeper/alien/Initialize() +/obj/machinery/vr_sleeper/alien/Initialize(mapload) . = ..() if(possible_species && possible_species.len) produce_species = pick(possible_species) diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index bca5e0d9d9..c9a78f27dc 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -25,13 +25,9 @@ active_power_usage = 200 light_color = "#FF0000" - -/obj/machinery/vr_sleeper/Initialize() +/obj/machinery/vr_sleeper/Initialize(mapload) . = ..() default_apply_parts() - -/obj/machinery/vr_sleeper/Initialize() - . = ..() smoke = new update_icon() diff --git a/code/game/machinery/vitals_monitor.dm b/code/game/machinery/vitals_monitor.dm index 50f1e5e2c4..8cb99d40ed 100644 --- a/code/game/machinery/vitals_monitor.dm +++ b/code/game/machinery/vitals_monitor.dm @@ -21,7 +21,7 @@ var/mob/living/carbon/human/victim var/beep = TRUE -/obj/machinery/vitals_monitor/Initialize() +/obj/machinery/vitals_monitor/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 7e04843911..256dc07f4b 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -29,7 +29,7 @@ /obj/item/clothing/head/helmet/space ) -/obj/machinery/washing_machine/Initialize() +/obj/machinery/washing_machine/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm index 2e0217bc44..152e8a8352 100644 --- a/code/game/mecha/combat/fighter.dm +++ b/code/game/mecha/combat/fighter.dm @@ -50,7 +50,7 @@ /obj/item/mecha_parts/component/electrical ) -/obj/mecha/combat/fighter/Initialize() +/obj/mecha/combat/fighter/Initialize(mapload) . = ..() ion_trail = new /datum/effect/effect/system/ion_trail_follow() ion_trail.set_up(src) @@ -264,14 +264,14 @@ var/image/stripe1_overlay var/image/stripe2_overlay -/obj/mecha/combat/fighter/gunpod/loaded/Initialize() //Loaded version with guns +/obj/mecha/combat/fighter/gunpod/loaded/Initialize(mapload) //Loaded version with guns . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser ME.attach(src) ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive ME.attach(src) -/obj/mecha/combat/fighter/gunpod/recon/Initialize() //Blinky +/obj/mecha/combat/fighter/gunpod/recon/Initialize(mapload) //Blinky . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src) ME.attach(src) @@ -336,7 +336,7 @@ ground_capable = FALSE -/obj/mecha/combat/fighter/baron/loaded/Initialize() //Loaded version with guns +/obj/mecha/combat/fighter/baron/loaded/Initialize(mapload) //Loaded version with guns . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser ME.attach(src) @@ -373,7 +373,7 @@ ground_capable = FALSE -/obj/mecha/combat/fighter/scoralis/loaded/Initialize() //Loaded version with guns +/obj/mecha/combat/fighter/scoralis/loaded/Initialize(mapload) //Loaded version with guns . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg ME.attach(src) @@ -412,7 +412,7 @@ health = 500 maxhealth = 500 -/obj/mecha/combat/fighter/allure/loaded/Initialize() //Loaded version with guns +/obj/mecha/combat/fighter/allure/loaded/Initialize(mapload) //Loaded version with guns . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/cloak ME.attach(src) @@ -449,7 +449,7 @@ health = 200 maxhealth = 200 -/obj/mecha/combat/fighter/pinnace/loaded/Initialize() //Loaded version with guns +/obj/mecha/combat/fighter/pinnace/loaded/Initialize(mapload) //Loaded version with guns . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser ME.attach(src) diff --git a/code/game/mecha/combat/gorilla.dm b/code/game/mecha/combat/gorilla.dm index db0a89fa98..c1b7097f6f 100644 --- a/code/game/mecha/combat/gorilla.dm +++ b/code/game/mecha/combat/gorilla.dm @@ -29,7 +29,7 @@ zoom_possible = 1 thrusters_possible = 1 -/obj/mecha/combat/gorilla/Initialize() +/obj/mecha/combat/gorilla/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src) // This thing basically cannot function without an external power supply. ME.attach(src) diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index 9d7bdbac5e..2d2ede3144 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -40,7 +40,7 @@ switch_dmg_type_possible = TRUE var/list/inherent_damage_absorption = list("brute"=0.7,"fire"=0.7,"bullet"=0.7,"laser"=0.7,"energy"=0.7,"bomb"=0.7) -/obj/mecha/combat/phazon/equipped/Initialize() +/obj/mecha/combat/phazon/equipped/Initialize(mapload) . = ..() starting_equipment = list( /obj/item/mecha_parts/mecha_equipment/tool/rcd, diff --git a/code/game/mecha/components/_component.dm b/code/game/mecha/components/_component.dm index 95ec0fbd53..9cbdcec2e2 100644 --- a/code/game/mecha/components/_component.dm +++ b/code/game/mecha/components/_component.dm @@ -42,7 +42,7 @@ if(0 to 1) . += span_boldwarning("It is completely destroyed.") -/obj/item/mecha_parts/component/Initialize() +/obj/item/mecha_parts/component/Initialize(mapload) . = ..() integrity = max_integrity diff --git a/code/game/mecha/equipment/tools/extinguisher.dm b/code/game/mecha/equipment/tools/extinguisher.dm index 6a219d553e..35f28462a8 100644 --- a/code/game/mecha/equipment/tools/extinguisher.dm +++ b/code/game/mecha/equipment/tools/extinguisher.dm @@ -11,7 +11,7 @@ var/spray_amount = 5 //units of liquid per particle. 5 is enough to wet the floor - it's a big fire extinguisher, so should be fine var/max_water = 1000 -/obj/item/mecha_parts/mecha_equipment/tool/extinguisher/Initialize() +/obj/item/mecha_parts/mecha_equipment/tool/extinguisher/Initialize(mapload) . = ..() reagents = new/datum/reagents(max_water) reagents.my_atom = src diff --git a/code/game/mecha/equipment/tools/generator.dm b/code/game/mecha/equipment/tools/generator.dm index 5869b50683..0cb0246fee 100644 --- a/code/game/mecha/equipment/tools/generator.dm +++ b/code/game/mecha/equipment/tools/generator.dm @@ -17,7 +17,7 @@ equip_type = EQUIP_UTILITY -/obj/item/mecha_parts/mecha_equipment/generator/Initialize() +/obj/item/mecha_parts/mecha_equipment/generator/Initialize(mapload) . = ..() fuel = new fuel_type(src) diff --git a/code/game/mecha/equipment/tools/inflatables.dm b/code/game/mecha/equipment/tools/inflatables.dm index 80350f0a2a..271df20146 100644 --- a/code/game/mecha/equipment/tools/inflatables.dm +++ b/code/game/mecha/equipment/tools/inflatables.dm @@ -13,7 +13,7 @@ tooltype = /obj/item/inflatable_dispenser/robot var/obj/item/inflatable_dispenser/my_deployer = null -/obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables/Initialize() +/obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables/Initialize(mapload) . = ..() my_deployer = my_tool diff --git a/code/game/mecha/equipment/tools/orescanner.dm b/code/game/mecha/equipment/tools/orescanner.dm index e2737b0d4d..71f91d2240 100644 --- a/code/game/mecha/equipment/tools/orescanner.dm +++ b/code/game/mecha/equipment/tools/orescanner.dm @@ -13,7 +13,7 @@ var/obj/item/mining_scanner/my_scanner = null var/exact_scan = FALSE -/obj/item/mecha_parts/mecha_equipment/tool/orescanner/Initialize() +/obj/item/mecha_parts/mecha_equipment/tool/orescanner/Initialize(mapload) my_scanner = new(src) return ..() @@ -38,4 +38,4 @@ /obj/item/mecha_parts/mecha_equipment/tool/orescanner/advanced name = "advanced ore scanner" icon_state = "mecha_analyzer_adv" - exact_scan = TRUE \ No newline at end of file + exact_scan = TRUE diff --git a/code/game/mecha/equipment/tools/powertool.dm b/code/game/mecha/equipment/tools/powertool.dm index 93a76b38f6..75133c798f 100644 --- a/code/game/mecha/equipment/tools/powertool.dm +++ b/code/game/mecha/equipment/tools/powertool.dm @@ -13,7 +13,7 @@ var/obj/item/my_tool = null var/tooltype = /obj/item/tool/wrench/power -/obj/item/mecha_parts/mecha_equipment/tool/powertool/Initialize() +/obj/item/mecha_parts/mecha_equipment/tool/powertool/Initialize(mapload) my_tool = new tooltype(src) my_tool.name = name my_tool.anchored = TRUE diff --git a/code/game/mecha/equipment/tools/rcd.dm b/code/game/mecha/equipment/tools/rcd.dm index 0a8adbc52f..f1980e079d 100644 --- a/code/game/mecha/equipment/tools/rcd.dm +++ b/code/game/mecha/equipment/tools/rcd.dm @@ -10,7 +10,7 @@ equip_type = EQUIP_SPECIAL var/obj/item/rcd/electric/mounted/mecha/my_rcd = null -/obj/item/mecha_parts/mecha_equipment/tool/rcd/Initialize() +/obj/item/mecha_parts/mecha_equipment/tool/rcd/Initialize(mapload) my_rcd = new(src) return ..() diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm index 40b351eeb1..8159a98e2c 100644 --- a/code/game/mecha/equipment/tools/shield_omni.dm +++ b/code/game/mecha/equipment/tools/shield_omni.dm @@ -74,7 +74,7 @@ var/obj/mecha/my_mech = null -/obj/item/shield_projector/rectangle/mecha/Initialize() +/obj/item/shield_projector/rectangle/mecha/Initialize(mapload) . = ..() my_mech = loc RegisterSignal(my_mech, COMSIG_OBSERVER_MOVED, /obj/item/shield_projector/proc/update_shield_positions) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 4717121506..22e06c47c8 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -18,7 +18,7 @@ origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4, TECH_MAGNET = 4, TECH_DATA = 3) required_type = list(/obj/mecha/medical) -/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/Initialize() +/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/Initialize(mapload) . = ..() flags |= NOREACT syringes = new @@ -311,7 +311,7 @@ equip_type = EQUIP_HULL -/obj/item/mecha_parts/mecha_equipment/crisis_drone/Initialize() +/obj/item/mecha_parts/mecha_equipment/crisis_drone/Initialize(mapload) . = ..() drone_overlay = new(src.icon, icon_state = droid_state) diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index c0dc029252..1d8cbf6367 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -16,7 +16,7 @@ /mob/living/silicon/robot/platform ) -/obj/machinery/mech_recharger/Initialize() +/obj/machinery/mech_recharger/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index e9cb47b4e4..d4e0b90024 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -84,7 +84,7 @@ "Misc", ) -/obj/machinery/mecha_part_fabricator/Initialize() +/obj/machinery/mecha_part_fabricator/Initialize(mapload) . = ..() // Go through all materials, and add them to the possible storage, but hide them unless we contain them. diff --git a/code/game/mecha/mech_prosthetics.dm b/code/game/mecha/mech_prosthetics.dm index af95409564..f6c8e05ae2 100644 --- a/code/game/mecha/mech_prosthetics.dm +++ b/code/game/mecha/mech_prosthetics.dm @@ -70,7 +70,7 @@ "Misc", ) -/obj/machinery/mecha_part_fabricator/pros/Initialize() +/obj/machinery/mecha_part_fabricator/pros/Initialize(mapload) . = ..() manufacturer = basic_robolimb.company diff --git a/code/game/mecha/mech_sensor.dm b/code/game/mecha/mech_sensor.dm index 522142830c..1541e22ad8 100644 --- a/code/game/mecha/mech_sensor.dm +++ b/code/game/mecha/mech_sensor.dm @@ -69,7 +69,7 @@ else icon_state = "airlock_sensor_off" -/obj/machinery/mech_sensor/Initialize() +/obj/machinery/mech_sensor/Initialize(mapload) . = ..() set_frequency(frequency) diff --git a/code/game/mecha/medical/medical.dm b/code/game/mecha/medical/medical.dm index b001e50822..395cc0e464 100644 --- a/code/game/mecha/medical/medical.dm +++ b/code/game/mecha/medical/medical.dm @@ -17,7 +17,7 @@ /obj/item/mecha_parts/component/electrical ) -/obj/mecha/medical/Initialize() +/obj/mecha/medical/Initialize(mapload) . = ..() var/turf/T = get_turf(src) if(isPlayerLevel(T.z)) diff --git a/code/game/mecha/space/hoverpod.dm b/code/game/mecha/space/hoverpod.dm index 21cb97632c..fcb9fee999 100644 --- a/code/game/mecha/space/hoverpod.dm +++ b/code/game/mecha/space/hoverpod.dm @@ -26,7 +26,7 @@ max_universal_equip = 1 max_special_equip = 1 -/obj/mecha/working/hoverpod/Initialize() +/obj/mecha/working/hoverpod/Initialize(mapload) . = ..() ion_trail = new /datum/effect/effect/system/ion_trail_follow() ion_trail.set_up(src) @@ -117,7 +117,7 @@ max_universal_equip = 1 max_special_equip = 1 -/obj/mecha/working/hoverpod/combatpod/Initialize() +/obj/mecha/working/hoverpod/combatpod/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser ME.attach(src) @@ -128,7 +128,7 @@ /obj/mecha/working/hoverpod/shuttlepod desc = "Who knew a tiny ball could fit three people?" -/obj/mecha/working/hoverpod/shuttlepod/Initialize() +/obj/mecha/working/hoverpod/shuttlepod/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger ME.attach(src) diff --git a/code/game/mecha/working/working.dm b/code/game/mecha/working/working.dm index 0daed8eef6..69bb34c535 100644 --- a/code/game/mecha/working/working.dm +++ b/code/game/mecha/working/working.dm @@ -6,7 +6,7 @@ max_universal_equip = 1 max_special_equip = 1 -/obj/mecha/working/Initialize() +/obj/mecha/working/Initialize(mapload) . = ..() var/turf/T = get_turf(src) if(isPlayerLevel(T.z)) diff --git a/code/game/objects/effects/alien/alien egg.dm b/code/game/objects/effects/alien/alien egg.dm index 9f6c0690d2..c2c899194d 100644 --- a/code/game/objects/effects/alien/alien egg.dm +++ b/code/game/objects/effects/alien/alien egg.dm @@ -8,7 +8,7 @@ anchored = 1 var/progress = 0 -/obj/structure/alien/egg/Initialize() +/obj/structure/alien/egg/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index bb2d11b860..5815194906 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -33,6 +33,7 @@ unacidable = TRUE plane = TURF_PLANE layer = ABOVE_TURF_LAYER + var/delete_me var/health = 15 var/obj/effect/alien/weeds/node/linked_node = null @@ -40,7 +41,7 @@ /obj/effect/alien/weeds/Initialize(mapload, var/node, var/newcolor) . = ..() - if(isspace(loc)) + if(isspace(loc) || delete_me) return INITIALIZE_HINT_QDEL linked_node = node @@ -82,6 +83,9 @@ if(existing == src) continue else + if(!(existing.flags & ATOM_INITIALIZED)) + existing.delete_me = TRUE + continue qdel(existing) linked_node = src diff --git a/code/game/objects/effects/bluespace_spawner_ch.dm b/code/game/objects/effects/bluespace_spawner_ch.dm index f81af322cf..71ffe1416f 100644 --- a/code/game/objects/effects/bluespace_spawner_ch.dm +++ b/code/game/objects/effects/bluespace_spawner_ch.dm @@ -11,7 +11,7 @@ var/spawned_num = 0 var/init_time -/obj/effect/bspawner/Initialize() +/obj/effect/bspawner/Initialize(mapload) . = ..() START_PROCESSING(SSobj,src) init_time = world.time @@ -34,4 +34,4 @@ . = ..() /obj/effect/bspawner/min30 - time_to_end = 30 MINUTES \ No newline at end of file + time_to_end = 30 MINUTES diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 2bbf4897e4..b374c1a5ac 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_EMPTY(bump_teleporters) density = TRUE opacity = 0 -/obj/effect/bump_teleporter/Initialize() +/obj/effect/bump_teleporter/Initialize(mapload) . = ..() GLOB.bump_teleporters += src diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index 6c1f5e7cd1..ff8c096172 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -7,7 +7,7 @@ time_to_live = 300 pass_flags = PASSTABLE | PASSGRILLE | PASSGLASS //PASSGLASS is fine here, it's just so the visual effect can "flow" around glass -/obj/effect/effect/smoke/chem/Initialize() +/obj/effect/effect/smoke/chem/Initialize(mapload) . = ..() create_reagents(500) diff --git a/code/game/objects/effects/chem/coating.dm b/code/game/objects/effects/chem/coating.dm index 3d18231d80..1b5e2b8c7e 100644 --- a/code/game/objects/effects/chem/coating.dm +++ b/code/game/objects/effects/chem/coating.dm @@ -6,7 +6,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "dirt" -/obj/effect/decal/cleanable/chemcoating/Initialize() +/obj/effect/decal/cleanable/chemcoating/Initialize(mapload) create_reagents(100) . = ..() var/turf/T = get_turf(src) diff --git a/code/game/objects/effects/chem/foam_vr.dm b/code/game/objects/effects/chem/foam_vr.dm index b7a22e629e..00b3ed9a28 100644 --- a/code/game/objects/effects/chem/foam_vr.dm +++ b/code/game/objects/effects/chem/foam_vr.dm @@ -6,7 +6,7 @@ dries = FALSE // We do this ourselves slips = FALSE -/obj/effect/effect/foam/firefighting/Initialize() +/obj/effect/effect/foam/firefighting/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -17,4 +17,4 @@ /obj/effect/effect/foam/firefighting/process() if(lifetime-- <= 0) flick("[icon_state]-disolve", src) - QDEL_IN(src, 5) \ No newline at end of file + QDEL_IN(src, 5) diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm index 72934e2da1..ad09ab9439 100644 --- a/code/game/objects/effects/chem/water.dm +++ b/code/game/objects/effects/chem/water.dm @@ -5,7 +5,7 @@ mouse_opacity = 0 pass_flags = PASSTABLE | PASSGRILLE | PASSBLOB -/obj/effect/effect/water/Initialize() +/obj/effect/effect/water/Initialize(mapload) . = ..() QDEL_IN(src, 15 SECONDS) diff --git a/code/game/objects/effects/confetti_vr.dm b/code/game/objects/effects/confetti_vr.dm index 92e5e5bdeb..854d3c7c28 100644 --- a/code/game/objects/effects/confetti_vr.dm +++ b/code/game/objects/effects/confetti_vr.dm @@ -3,7 +3,7 @@ icon = 'icons/effects/effects_vr.dmi' icon_state = "confetti" -/obj/effect/effect/sparks/Initialize() +/obj/effect/effect/sparks/Initialize(mapload) . = ..() playsound(src, "sounds/items/confetti.ogg ", 100, 1) @@ -39,4 +39,4 @@ sleep(5) step(confetti,direction) spawn(20) - src.total_sparks-- \ No newline at end of file + src.total_sparks-- diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index d6478d6ae2..41c26220a7 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -266,12 +266,12 @@ var/global/list/image/splatter_cache=list() var/dry = 0 // Keeps the lag down var/sampled = FALSE -/obj/effect/decal/cleanable/mucus/Initialize() +/obj/effect/decal/cleanable/mucus/mapped/Initialize(mapload) . = ..() VARSET_IN(src, dry, TRUE, DRYING_TIME * 2) //This version should be used for admin spawns and pre-mapped virus vectors (e.g. in PoIs), this version does not dry -/obj/effect/decal/cleanable/mucus/mapped/Initialize() +/obj/effect/decal/cleanable/mucus/mapped/Initialize(mapload) . = ..() viruses |= new /datum/disease/advance diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index cfe4829644..2f0afcffca 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -165,7 +165,7 @@ pixel_x = -32 pixel_y = 0 -/obj/structure/sign/poster/Initialize() +/obj/structure/sign/poster/Initialize(mapload) . = ..() if (poster_type) var/path = text2path(poster_type) diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm index 69781c6b97..77e0032684 100644 --- a/code/game/objects/effects/decals/posters/posters.dm +++ b/code/game/objects/effects/decals/posters/posters.dm @@ -83,7 +83,7 @@ icon_state = "rolled_poster_nt" poster_type = /obj/structure/sign/poster/nanotrasen -/obj/item/poster/nanotrasen/Initialize(turf/loc, var/decl/poster/P = null) +/obj/item/poster/nanotrasen/Initialize(mapload, var/decl/poster/P = null) if(!ispath(src.poster_decl) && !ispath(P) && !istype(P)) src.poster_decl = get_poster_decl(/decl/poster/nanotrasen, FALSE) return ..() diff --git a/code/game/objects/effects/decals/warning_stripes.dm b/code/game/objects/effects/decals/warning_stripes.dm index c470d186ce..820b2a8db8 100644 --- a/code/game/objects/effects/decals/warning_stripes.dm +++ b/code/game/objects/effects/decals/warning_stripes.dm @@ -1,7 +1,7 @@ /obj/effect/decal/warning_stripes icon = 'icons/effects/warning_stripes.dmi' -/obj/effect/decal/warning_stripes/Initialize() +/obj/effect/decal/warning_stripes/Initialize(mapload) . = ..() var/turf/T=get_turf(src) var/image/I=image(icon, icon_state = icon_state, dir = dir) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 094a9c464a..e56742e757 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -102,7 +102,7 @@ steam.start() -- spawns the effect anchored = TRUE mouse_opacity = 0 -/obj/effect/effect/sparks/Initialize() +/obj/effect/effect/sparks/Initialize(mapload) . = ..() playsound(src, "sparks", 100, 1) var/turf/T = src.loc @@ -179,7 +179,7 @@ steam.start() -- spawns the effect pixel_x = -32 pixel_y = -32 -/obj/effect/effect/smoke/Initialize() +/obj/effect/effect/smoke/Initialize(mapload) . = ..() if(time_to_live) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), time_to_live, TIMER_DELETE_ME) @@ -290,7 +290,7 @@ steam.start() -- spawns the effect opacity = FALSE var/strength = 5 // How much damage to do inside each affect() -/obj/effect/effect/smoke/elemental/Initialize() +/obj/effect/effect/smoke/elemental/Initialize(mapload) START_PROCESSING(SSobj, src) return ..() diff --git a/code/game/objects/effects/effect_system_ch.dm b/code/game/objects/effects/effect_system_ch.dm index e1bfbd2c8e..d797791a10 100644 --- a/code/game/objects/effects/effect_system_ch.dm +++ b/code/game/objects/effects/effect_system_ch.dm @@ -100,7 +100,7 @@ plane = MOB_PLANE layer = ABOVE_MOB_LAYER -/obj/effect/effect/teleport_greyscale/Initialize() +/obj/effect/effect/teleport_greyscale/Initialize(mapload) . = ..() QDEL_IN(src, 2 SECONDS) @@ -116,4 +116,4 @@ /datum/effect/effect/system/teleport_greyscale/start() var/obj/effect/effect/teleport_greyscale/tele = new /obj/effect/effect/teleport_greyscale(src.location) - tele.color = color \ No newline at end of file + tele.color = color diff --git a/code/game/objects/effects/explosion_particles.dm b/code/game/objects/effects/explosion_particles.dm index 028515921e..d729dfc026 100644 --- a/code/game/objects/effects/explosion_particles.dm +++ b/code/game/objects/effects/explosion_particles.dm @@ -6,7 +6,7 @@ anchored = TRUE mouse_opacity = 0 -/obj/effect/expl_particles/Initialize() +/obj/effect/expl_particles/Initialize(mapload) . = ..() QDEL_IN(src, 1.5 SECONDS) return @@ -41,7 +41,7 @@ pixel_x = -32 pixel_y = -32 -/obj/effect/explosion/Initialize() +/obj/effect/explosion/Initialize(mapload) . = ..() QDEL_IN(src, 1 SECOND) return diff --git a/code/game/objects/effects/landmarks_events.dm b/code/game/objects/effects/landmarks_events.dm index e7d4b10bb7..8e4b0ca25b 100644 --- a/code/game/objects/effects/landmarks_events.dm +++ b/code/game/objects/effects/landmarks_events.dm @@ -16,7 +16,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm var/isLoud = FALSE var/isNarrate = FALSE -/obj/effect/landmark/event_trigger/Initialize() +/obj/effect/landmark/event_trigger/Initialize(mapload) . = ..() coordinates = "(X:[loc.x];Y:[loc.y];Z:[loc.z])" @@ -89,7 +89,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm var/isWarning = FALSE //For personal messages isNarrate = TRUE -/obj/effect/landmark/event_trigger/auto_narrate/Initialize() +/obj/effect/landmark/event_trigger/auto_narrate/Initialize(mapload) . = ..() message_range = world.view diff --git a/code/game/objects/effects/landmarks_poi_vr.dm b/code/game/objects/effects/landmarks_poi_vr.dm index 0797705a69..d984ab241e 100644 --- a/code/game/objects/effects/landmarks_poi_vr.dm +++ b/code/game/objects/effects/landmarks_poi_vr.dm @@ -12,7 +12,7 @@ var/global/list/global_used_pois = list() /obj/effect/landmark/poi_loader/New() INITIALIZE_IMMEDIATE(/obj/effect/landmark/poi_loader) -/obj/effect/landmark/poi_loader/Initialize() +/obj/effect/landmark/poi_loader/Initialize(mapload) src.load_poi() return ..() diff --git a/code/game/objects/effects/landmarks_vr.dm b/code/game/objects/effects/landmarks_vr.dm index ea6424265a..92c283e123 100644 --- a/code/game/objects/effects/landmarks_vr.dm +++ b/code/game/objects/effects/landmarks_vr.dm @@ -16,7 +16,7 @@ name = "Antag Latespawn" var/antag_id -/obj/effect/landmark/late_antag/Initialize() +/obj/effect/landmark/late_antag/Initialize(mapload) . = ..() var/datum/antagonist/A = all_antag_types[antag_id] if(istype(A)) diff --git a/code/game/objects/effects/manifest.dm b/code/game/objects/effects/manifest.dm index 0e9441085c..6aae6168a6 100644 --- a/code/game/objects/effects/manifest.dm +++ b/code/game/objects/effects/manifest.dm @@ -4,7 +4,7 @@ icon_state = "x" unacidable = TRUE//Just to be sure. -/obj/effect/manifest/Initialize() +/obj/effect/manifest/Initialize(mapload) . = ..() invisibility = 101 diff --git a/code/game/objects/effects/map_effects/beam_point.dm b/code/game/objects/effects/map_effects/beam_point.dm index e8973e5fca..dff889889d 100644 --- a/code/game/objects/effects/map_effects/beam_point.dm +++ b/code/game/objects/effects/map_effects/beam_point.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(all_beam_points) var/beam_type = /obj/effect/ebeam // The type of beam. Default has no special properties. Some others may do things like hurt things touching it. var/beam_sleep_time = 3 // How often the beam updates visually. Suggested to leave this alone, 3 is already fast. -/obj/effect/map_effect/beam_point/Initialize() +/obj/effect/map_effect/beam_point/Initialize(mapload) GLOB.all_beam_points += src if(make_beams_on_init) create_beams() diff --git a/code/game/objects/effects/map_effects/effect_emitter.dm b/code/game/objects/effects/map_effects/effect_emitter.dm index 7ea9a93eea..c2b2ccb89b 100644 --- a/code/game/objects/effects/map_effects/effect_emitter.dm +++ b/code/game/objects/effects/map_effects/effect_emitter.dm @@ -7,7 +7,7 @@ var/effect_cardinals_only = FALSE // If true, effects only move in cardinal directions. var/effect_forced_dir = null // If set, effects emitted will always move in this direction. -/obj/effect/map_effect/interval/effect_emitter/Initialize() +/obj/effect/map_effect/interval/effect_emitter/Initialize(mapload) effect_system = new effect_system_type() effect_system.attach(src) configure_effects() diff --git a/code/game/objects/effects/map_effects/map_effects.dm b/code/game/objects/effects/map_effects/map_effects.dm index ef1099d4b4..babf67054e 100644 --- a/code/game/objects/effects/map_effects/map_effects.dm +++ b/code/game/objects/effects/map_effects/map_effects.dm @@ -27,10 +27,10 @@ var/interval_lower_bound = 5 SECONDS // Lower number for how often the map_effect will trigger. var/interval_upper_bound = 5 SECONDS // Higher number for above. -/obj/effect/map_effect/interval/Initialize() +/obj/effect/map_effect/interval/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) - + /obj/effect/map_effect/interval/Destroy() STOP_PROCESSING(SSobj, src) return ..() @@ -44,7 +44,7 @@ //Not yet! if(world.time < next_attempt) return - + // Check to see if we're useful first. if(!always_run && !check_for_player_proximity(src, proximity_needed, ignore_ghosts, ignore_afk)) next_attempt = world.time + retry_delay diff --git a/code/game/objects/effects/map_effects/portal.dm b/code/game/objects/effects/map_effects/portal.dm index 935c6c7471..7dd6219fd7 100644 --- a/code/game/objects/effects/map_effects/portal.dm +++ b/code/game/objects/effects/map_effects/portal.dm @@ -145,7 +145,7 @@ when portals are shortly lived, or when portals are made to be obvious with spec var/portal_id = "test" // For a portal to be made, both the A and B sides need to share the same ID value. var/list/portal_lines = list() -/obj/effect/map_effect/portal/master/Initialize() +/obj/effect/map_effect/portal/master/Initialize(mapload) GLOB.all_portal_masters += src find_lines() ..() diff --git a/code/game/objects/effects/map_effects/radiation_emitter.dm b/code/game/objects/effects/map_effects/radiation_emitter.dm index 89a8d194f5..510a0eae1c 100644 --- a/code/game/objects/effects/map_effects/radiation_emitter.dm +++ b/code/game/objects/effects/map_effects/radiation_emitter.dm @@ -4,7 +4,7 @@ icon_state = "radiation_emitter" var/radiation_power = 30 // Bigger numbers means more radiation. -/obj/effect/map_effect/radiation_emitter/Initialize() +/obj/effect/map_effect/radiation_emitter/Initialize(mapload) START_PROCESSING(SSobj, src) return ..() @@ -16,4 +16,4 @@ SSradiation.radiate(src, radiation_power) /obj/effect/map_effect/radiation_emitter/strong - radiation_power = 100 \ No newline at end of file + radiation_power = 100 diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 1d7325f3a7..e27099079b 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -15,7 +15,7 @@ // The trap item will be triggered in some manner when detonating. Default only checks for grenades. var/obj/item/trap = null -/obj/effect/mine/Initialize() +/obj/effect/mine/Initialize(mapload) icon_state = "landmine_armed" wires = new(src) . = ..() diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index d51d769d56..b8adc6f1f0 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -14,7 +14,7 @@ invisibility = 0 var/time_to_die = 10 SECONDS // Afer which, it will delete itself. -/obj/effect/temporary_effect/Initialize() +/obj/effect/temporary_effect/Initialize(mapload) . = ..() if(time_to_die) QDEL_IN(src, time_to_die) @@ -33,7 +33,7 @@ pixel_x = -32 pixel_y = -32 -/obj/effect/temporary_effect/cleave_attack/Initialize() // Makes the slash fade smoothly. When completely transparent it should qdel itself. +/obj/effect/temporary_effect/cleave_attack/Initialize(mapload) // Makes the slash fade smoothly. When completely transparent it should qdel itself. . = ..() animate(src, alpha = 0, time = time_to_die - 1) @@ -59,7 +59,7 @@ time_to_die = 1 SECOND pixel_x = -32 -/obj/effect/temporary_effect/lightning_strike/Initialize() +/obj/effect/temporary_effect/lightning_strike/Initialize(mapload) icon_state += "[rand(1,2)]" // To have two variants of lightning sprites. animate(src, alpha = 0, time = time_to_die - 1) . = ..() @@ -114,7 +114,7 @@ var/trans_angle var/icon_dist -/obj/effect/abstract/directional_lighting/Initialize() +/obj/effect/abstract/directional_lighting/Initialize(mapload) . = ..() vis_contents += light_spot diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index af3891263c..3276b3de86 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -53,7 +53,7 @@ layer = ABOVE_MOB_LAYER mouse_opacity = 0 -/obj/effect/overlay/wallrot/Initialize() +/obj/effect/overlay/wallrot/Initialize(mapload) . = ..() pixel_x += rand(-10, 10) pixel_y += rand(-10, 10) @@ -165,7 +165,7 @@ var/static/matrix/normal_transform -/obj/effect/overlay/light_cone/Initialize() +/obj/effect/overlay/light_cone/Initialize(mapload) . = ..() apply_standard_transform() diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 2a9283213b..2682899ebf 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal) return return -/obj/effect/portal/Initialize() +/obj/effect/portal/Initialize(mapload) . = ..() QDEL_IN(src, 30 SECONDS) diff --git a/code/game/objects/effects/prop/columnblast.dm b/code/game/objects/effects/prop/columnblast.dm index ce0e4b2aad..15a755b051 100644 --- a/code/game/objects/effects/prop/columnblast.dm +++ b/code/game/objects/effects/prop/columnblast.dm @@ -16,7 +16,7 @@ ..() -/obj/effect/temporary_effect/eruption/Initialize() +/obj/effect/temporary_effect/eruption/Initialize(mapload) . = ..() flick("[icon_state]_create",src) @@ -51,4 +51,4 @@ L.fire_stacks += 2 L.add_modifier(/datum/modifier/fire/stack_managed/intense, 30 SECONDS) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index e94c2f5323..14fd9fe349 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -50,8 +50,8 @@ if(co != null) carbon_amt = co ..() -/obj/effect/spawner/newbomb/Initialize(newloc) - ..(newloc) +/obj/effect/spawner/newbomb/Initialize(mapload) + ..() var/obj/item/transfer_valve/V = new(src.loc) var/obj/item/tank/phoron/PT = new(V) var/obj/item/tank/oxygen/OT = new(V) diff --git a/code/game/objects/effects/spawners/graffiti.dm b/code/game/objects/effects/spawners/graffiti.dm index 9450c90206..b9759fc810 100644 --- a/code/game/objects/effects/spawners/graffiti.dm +++ b/code/game/objects/effects/spawners/graffiti.dm @@ -8,7 +8,7 @@ // If the effect's color is not set, it will be chosen at random. var/color_secondary // The hexcode for the desired secondary color of your graffiti. If blank, it will inherit this effect's color. -/obj/effect/graffitispawner/Initialize() +/obj/effect/graffitispawner/Initialize(mapload) ..() if(!color) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 51b4c88c36..fd4ed0af80 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -72,7 +72,7 @@ /obj/effect/spider/stickyweb icon_state = "stickyweb1" -/obj/effect/spider/stickyweb/Initialize() +/obj/effect/spider/stickyweb/Initialize(mapload) if(prob(50)) icon_state = "stickyweb2" return ..() @@ -98,7 +98,7 @@ var/spider_type = /obj/effect/spider/spiderling var/faction = FACTION_SPIDERS -/obj/effect/spider/eggcluster/Initialize() +/obj/effect/spider/eggcluster/Initialize(mapload) pixel_x = rand(3,-3) pixel_y = rand(3,-3) START_PROCESSING(SSobj, src) diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 2a877f2e54..f2d510ffc8 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -171,7 +171,7 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob) var/obj/effect/landmark/the_landmark = null var/landmark_id = null -/obj/effect/step_trigger/teleporter/landmark/Initialize() +/obj/effect/step_trigger/teleporter/landmark/Initialize(mapload) . = ..() for(var/obj/effect/landmark/teleport_mark/mark in GLOB.tele_landmarks) if(mark.landmark_id == landmark_id) @@ -188,7 +188,7 @@ GLOBAL_LIST_EMPTY(tele_landmarks) /obj/effect/landmark/teleport_mark var/landmark_id = null -/obj/effect/landmark/teleport_mark/Initialize() +/obj/effect/landmark/teleport_mark/Initialize(mapload) . = ..() GLOB.tele_landmarks += src diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index 5bbb7a19f1..ad4280496c 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -9,7 +9,7 @@ var/randomdir = TRUE var/timerid -/obj/effect/temp_visual/Initialize() +/obj/effect/temp_visual/Initialize(mapload) . = ..() if(randomdir) dir = pick(list(NORTH, SOUTH, EAST, WEST)) @@ -31,7 +31,7 @@ /obj/effect/temp_visual/dir_setting randomdir = FALSE -/obj/effect/temp_visual/dir_setting/Initialize(loc, set_dir) +/obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir) if(set_dir) dir = set_dir . = ..() diff --git a/code/game/objects/effects/temporary_visuials/temproary_visual.dm b/code/game/objects/effects/temporary_visuials/temproary_visual.dm index 0ecaf5e312..752afc3420 100644 --- a/code/game/objects/effects/temporary_visuials/temproary_visual.dm +++ b/code/game/objects/effects/temporary_visuials/temproary_visual.dm @@ -8,7 +8,7 @@ var/duration = 10 //in deciseconds var/randomdir = TRUE -/obj/effect/temp_visual/Initialize() +/obj/effect/temp_visual/Initialize(mapload) . = ..() if(randomdir) set_dir(pick(global.cardinal)) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 924a14b679..c83e356951 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -158,7 +158,7 @@ var/stasis_level = 3 //Every 'this' life ticks are applied to the mob (when life_ticks%stasis_level == 1) var/obj/item/reagent_containers/syringe/syringe -/obj/structure/closet/body_bag/cryobag/Initialize() +/obj/structure/closet/body_bag/cryobag/Initialize(mapload) tank = new tank_type(null) //It's in nullspace to prevent ejection when the bag is opened. ..() diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 3ad1e7c131..c67b6846a4 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -26,7 +26,7 @@ list(REAGENT_ID_IMPEDREZENE = 15) = 2, list(REAGENT_ID_ZOMBIEPOWDER = 10) = 1) -/obj/item/reagent_containers/glass/beaker/vial/random/Initialize() +/obj/item/reagent_containers/glass/beaker/vial/random/Initialize(mapload) . = ..() if(is_open_container()) flags ^= OPENCONTAINER @@ -62,7 +62,7 @@ desc = "A powdered form of what appears to be [R.name]. There's about [reagents.total_volume] units here." return ..() -/obj/item/reagent_containers/powder/Initialize() +/obj/item/reagent_containers/powder/Initialize(mapload) . = ..() get_appearance() diff --git a/code/game/objects/items/devices/communicator/cartridge.dm b/code/game/objects/items/devices/communicator/cartridge.dm index 4ea2b30836..77b049e627 100644 --- a/code/game/objects/items/devices/communicator/cartridge.dm +++ b/code/game/objects/items/devices/communicator/cartridge.dm @@ -379,7 +379,8 @@ ..() internal_devices |= new /obj/item/halogen_counter(src) -/obj/item/commcard/engineering/Initialize() +/obj/item/commcard/engineering/Initialize(mapload) + . = ..() internal_data["grid_sensors"] = find_powernet_sensors() internal_data["powernet_target"] = "" @@ -616,10 +617,10 @@ internal_data["stat_display_active2"] = null internal_data["stat_display_special"] = null -/obj/item/commcard/head/Initialize() +/obj/item/commcard/head/Initialize(mapload) // Have to register the commcard with the Radio controller to receive updates to the status displays radio_controller.add_object(src, 1435) - ..() + . = ..() /obj/item/commcard/head/Destroy() // Have to unregister the commcard for proper bookkeeping @@ -793,7 +794,8 @@ internal_devices |= new /obj.item/analyzer(src) internal_devices |= new /obj/item/halogen_counter(src) -/obj/item/commcard/head/ce/Initialize() +/obj/item/commcard/head/ce/Initialize(mapload) + . = ..() internal_data["grid_sensors"] = find_powernet_sensors() internal_data["powernet_target"] = "" @@ -904,7 +906,8 @@ list("name" = "Shuttle Blast Door Control", "template" = "merc_blast_door_control.tmpl") ) -/obj/item/commcard/mercenary/Initialize() +/obj/item/commcard/mercenary/Initialize(mapload) + . = ..() internal_data["shuttle_door_code"] = "smindicate" // Copied from PDA code internal_data["shuttle_doors"] = find_blast_doors() diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 9fe9c0abf9..442a3a9949 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -97,7 +97,7 @@ var/global/list/obj/item/communicator/all_communicators = list() // Parameters: None // Description: Adds the new communicator to the global list of all communicators, sorts the list, obtains a reference to the Exonet node, then tries to // assign the device to the holder's name automatically in a spectacularly shitty way. -/obj/item/communicator/Initialize() +/obj/item/communicator/Initialize(mapload) . = ..() all_communicators += src all_communicators = sortAtom(all_communicators) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index c1a8ee9a09..3a827a8d99 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -25,7 +25,7 @@ /obj/item/defib_kit/get_cell() return bcell -/obj/item/defib_kit/Initialize() //starts without a cell for rnd //ChompEDIT New --> Initialize +/obj/item/defib_kit/Initialize(mapload) //starts without a cell for rnd . = ..() if(ispath(paddles)) paddles = new paddles(src, src) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 6a3783e081..07ffa4bd27 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -36,7 +36,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/flash/Initialize() +/obj/item/flash/Initialize(mapload) . = ..() power_supply = new cell_type(src) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 1a9007ca30..39ae3f9801 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -36,7 +36,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/flashlight/Initialize() +/obj/item/flashlight/Initialize(mapload) . = ..() if(power_use && cell_type) @@ -367,7 +367,7 @@ pickup_sound = 'sound/items/pickup/gloves.ogg' light_system = MOVABLE_LIGHT -/obj/item/flashlight/flare/Initialize() +/obj/item/flashlight/flare/Initialize(mapload) fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds. . = ..() @@ -430,7 +430,7 @@ var/fuel = 0 power_use = 0 -/obj/item/flashlight/glowstick/Initialize() +/obj/item/flashlight/glowstick/Initialize(mapload) fuel = rand(1600, 2000) . = ..() diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index c592bdc9ac..94f1aac862 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -16,7 +16,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/geiger/Initialize() +/obj/item/geiger/Initialize(mapload) soundloop = new(list(src), FALSE) return ..() @@ -110,7 +110,7 @@ var/last_tick //used to delay the powercheck var/wiresexposed = 0 -/obj/item/geiger/wall/Initialize() +/obj/item/geiger/wall/Initialize(mapload) START_PROCESSING(SSobj, src) soundloop = new(list(src), FALSE) return ..() diff --git a/code/game/objects/items/devices/geiger_yw.dm b/code/game/objects/items/devices/geiger_yw.dm index 4cb9d51c1e..a60f875021 100644 --- a/code/game/objects/items/devices/geiger_yw.dm +++ b/code/game/objects/items/devices/geiger_yw.dm @@ -16,10 +16,10 @@ var/last_tick //used to delay the powercheck var/wiresexposed = 0 -/obj/item/geiger/wall/Initialize() +/obj/item/geiger/wall/Initialize(mapload) + . = ..() START_PROCESSING(SSobj, src) soundloop = new(list(src), FALSE) - return ..() /obj/item/geiger/wall/Destroy() STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index c702d7f439..e89098a933 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(GPS_list) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/gps/Initialize() +/obj/item/gps/Initialize(mapload) . = ..() compass = new(src) GLOB.GPS_list += src diff --git a/code/game/objects/items/devices/paicard_vr.dm b/code/game/objects/items/devices/paicard_vr.dm index f04cc342cc..5ddcc1abc7 100644 --- a/code/game/objects/items/devices/paicard_vr.dm +++ b/code/game/objects/items/devices/paicard_vr.dm @@ -346,7 +346,7 @@ var/global/list/paikeys = list() icon_state = "broken" pickup_sound = 'sound/items/pickup/card.ogg' drop_sound = 'sound/items/drop/card.ogg' -/obj/item/paiparts/Initialize() +/obj/item/paiparts/Initialize(mapload) . = ..() pixel_x = rand(-10,10) pixel_y = rand(-10,10) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e575ee3a91..5d54a5c10c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -21,7 +21,7 @@ drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' -/obj/item/radio/headset/Initialize() +/obj/item/radio/headset/Initialize(mapload) . = ..() internal_channels.Cut() if(ks1type) @@ -674,7 +674,7 @@ syndie = 1 ks1type = /obj/item/encryptionkey/raider -/obj/item/radio/headset/raider/Initialize() +/obj/item/radio/headset/raider/Initialize(mapload) . = ..() set_frequency(RAID_FREQ) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 5b41c397e9..c56d0d2add 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -17,7 +17,7 @@ var/number = 0 var/wiresexposed = FALSE -/obj/item/radio/intercom/Initialize() +/obj/item/radio/intercom/Initialize(mapload) . = ..() var/area/A = get_area(src) if(A) @@ -80,26 +80,26 @@ /obj/item/radio/intercom/omni name = "global announcer" -/obj/item/radio/intercom/omni/Initialize() +/obj/item/radio/intercom/omni/Initialize(mapload) channels = radiochannels.Copy() return ..() -/obj/item/radio/intercom/Initialize() +/obj/item/radio/intercom/Initialize(mapload) . = ..() circuit = new circuit(src) -/obj/item/radio/intercom/department/medbay/Initialize() +/obj/item/radio/intercom/department/medbay/Initialize(mapload) . = ..() internal_channels = default_medbay_channels.Copy() -/obj/item/radio/intercom/department/security/Initialize() +/obj/item/radio/intercom/department/security/Initialize(mapload) . = ..() internal_channels = list( num2text(PUB_FREQ) = list(), num2text(SEC_I_FREQ) = list(access_security) ) -/obj/item/radio/intercom/entertainment/Initialize() +/obj/item/radio/intercom/entertainment/Initialize(mapload) . = ..() internal_channels = list( num2text(PUB_FREQ) = list(), @@ -113,7 +113,7 @@ subspace_transmission = TRUE syndie = TRUE -/obj/item/radio/intercom/syndicate/Initialize() +/obj/item/radio/intercom/syndicate/Initialize(mapload) . = ..() internal_channels[num2text(SYND_FREQ)] = list(access_syndicate) @@ -124,7 +124,7 @@ subspace_transmission = TRUE syndie = TRUE -/obj/item/radio/intercom/raider/Initialize() +/obj/item/radio/intercom/raider/Initialize(mapload) . = ..() internal_channels[num2text(RAID_FREQ)] = list(access_syndicate) diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm index 9734237188..60fd1eed5d 100644 --- a/code/game/objects/items/devices/radio/jammer.dm +++ b/code/game/objects/items/devices/radio/jammer.dm @@ -34,7 +34,7 @@ var/global/list/active_radio_jammers = list() pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/radio_jammer/Initialize() +/obj/item/radio_jammer/Initialize(mapload) . = ..() power_source = new(src) update_icon() // So it starts with the full overlay. diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index acc96ba1f8..abdf86cb23 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -768,6 +768,6 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) /obj/item/radio/phone/medbay frequency = MED_I_FREQ -/obj/item/radio/phone/medbay/Initialize() +/obj/item/radio/phone/medbay/Initialize(mapload) . = ..() internal_channels = default_medbay_channels.Copy() diff --git a/code/game/objects/items/devices/radio/radio_ch.dm b/code/game/objects/items/devices/radio/radio_ch.dm index cd5be49d8e..0bf08a035e 100644 --- a/code/game/objects/items/devices/radio/radio_ch.dm +++ b/code/game/objects/items/devices/radio/radio_ch.dm @@ -6,12 +6,12 @@ for(var/cand_x = max(0, T.x - canhear_range), cand_x <= T.x + canhear_range, cand_x++) for(var/cand_y = max(0, T.y - canhear_range), cand_y <= T.y + canhear_range, cand_y++) var/turf/cand_turf = locate(cand_x,cand_y,T.z) - if(!cand_turf) + if(!cand_turf) continue if((abs(T.x - cand_x) < dnumber) || (abs(T.y - cand_y) < dnumber)) output += cand_turf continue - if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range) + if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range) output += cand_turf continue return output @@ -27,12 +27,12 @@ for(var/cand_x = max(0, T.x - canhear_range), cand_x <= T.x + canhear_range, cand_x++) for(var/cand_y = max(0, T.y - canhear_range), cand_y <= T.y + canhear_range, cand_y++) var/turf/cand_turf = locate(cand_x,cand_y,T.z) - if(!cand_turf) + if(!cand_turf) continue if((abs(T.x - cand_x) < dnumber) || (abs(T.y - cand_y) < dnumber)) output += cand_turf continue - if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range) + if(sqrt((T.x - cand_x)**2 + (T.y - cand_y)**2) <= canhear_range) output += cand_turf continue broadcast_tiles = output @@ -41,7 +41,7 @@ . = ..() update_broadcast_tiles() -/obj/item/radio/intercom/Initialize() +/obj/item/radio/intercom/Initialize(mapload) . = ..() update_broadcast_tiles() @@ -72,4 +72,4 @@ bs_tx_preload_id = "Receiver A" //Transmit to a receiver bs_rx_preload_id = "Broadcaster A" //Recveive from a transmitter -#undef CANBROADCAST_INNERBOX \ No newline at end of file +#undef CANBROADCAST_INNERBOX diff --git a/code/game/objects/items/devices/radio/radio_vr.dm b/code/game/objects/items/devices/radio/radio_vr.dm index 8801d779fa..55b5435631 100644 --- a/code/game/objects/items/devices/radio/radio_vr.dm +++ b/code/game/objects/items/devices/radio/radio_vr.dm @@ -10,7 +10,7 @@ subspace_transmission = TRUE adhoc_fallback = TRUE -/obj/item/radio/emergency/Initialize() +/obj/item/radio/emergency/Initialize(mapload) . = ..() internal_channels = default_medbay_channels.Copy() diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm index c4e53205cd..010ed4935a 100644 --- a/code/game/objects/items/devices/radio/radiopack.dm +++ b/code/game/objects/items/devices/radio/radiopack.dm @@ -14,7 +14,7 @@ var/obj/item/radio/bluespacehandset/linked/handset = /obj/item/radio/bluespacehandset/linked -/obj/item/bluespaceradio/Initialize() +/obj/item/bluespaceradio/Initialize(mapload) . = ..() if(ispath(handset)) handset = new handset(src, src) diff --git a/code/game/objects/items/devices/scanners/sleevemate.dm b/code/game/objects/items/devices/scanners/sleevemate.dm index c82f0c539e..b541a8c715 100644 --- a/code/game/objects/items/devices/scanners/sleevemate.dm +++ b/code/game/objects/items/devices/scanners/sleevemate.dm @@ -31,7 +31,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/sleevemate/Initialize() +/obj/item/sleevemate/Initialize(mapload) . = ..() our_db = SStranscore.db_by_key(db_key) diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index f49036b0d2..77d1834752 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -31,7 +31,7 @@ /obj/item/suit_cooling_unit/ui_action_click(mob/user, actiontype) toggle(user) -/obj/item/suit_cooling_unit/Initialize() +/obj/item/suit_cooling_unit/Initialize(mapload) . = ..() if(ispath(cell)) cell = new cell(src) diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 2f64154af2..53aa520424 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -34,7 +34,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/perfect_tele/Initialize() +/obj/item/perfect_tele/Initialize(mapload) . = ..() flags |= NOBLUDGEON diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm index ed66eec43e..aeb06fd95a 100644 --- a/code/game/objects/items/devices/tvcamera.dm +++ b/code/game/objects/items/devices/tvcamera.dm @@ -31,7 +31,7 @@ . += "Video feed is [camera.status ? "on" : "off"]" . += "Audio feed is [radio.broadcasting ? "on" : "off"]" -/obj/item/tvcamera/Initialize() +/obj/item/tvcamera/Initialize(mapload) . = ..() camera = new(src) camera.c_tag = channel @@ -195,7 +195,7 @@ . += "Video feed is [bcamera.status ? "on" : "off"]" . += "Audio feed is [bradio.broadcasting ? "on" : "off"]" -/obj/item/clothing/accessory/bodycam/Initialize() +/obj/item/clothing/accessory/bodycam/Initialize(mapload) . = ..() bcamera = new(src) bcamera.c_tag = channel diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index d525a6856e..c02c283dbd 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -57,7 +57,7 @@ var/selected_cat // The hidden uplink MUST be inside an obj/item's contents. -/obj/item/uplink/hidden/Initialize() +/obj/item/uplink/hidden/Initialize(mapload) . = ..() if(!isitem(loc)) return INITIALIZE_HINT_QDEL @@ -237,6 +237,6 @@ /obj/item/radio/headset/uplink traitor_frequency = 1445 -/obj/item/radio/headset/uplink/Initialize() +/obj/item/radio/headset/uplink/Initialize(mapload) . = ..() hidden_uplink = new(src) diff --git a/code/game/objects/items/falling_object_attack_vr.dm b/code/game/objects/items/falling_object_attack_vr.dm index 879fee9fde..bfd9dc22dd 100644 --- a/code/game/objects/items/falling_object_attack_vr.dm +++ b/code/game/objects/items/falling_object_attack_vr.dm @@ -7,16 +7,12 @@ icon_state = "drop_marker" /obj/effect/calldown_attack/Initialize(mapload) - ..() - return INITIALIZE_HINT_LATELOAD - -/obj/effect/calldown_attack/LateInitialize() var/delay = rand(25, 30) - spawn(delay-7) - new /obj/effect/falling_effect/calldown_attack(src.loc) - spawn(delay) - qdel(src) + addtimer(CALLBACK(src, PROC_REF(spawn_object)), delay-7) +/obj/effect/calldown_attack/proc/spawn_object() + new /obj/effect/falling_effect/calldown_attack(loc) + QDEL_IN(src, 0.7 SECONDS) /obj/effect/falling_effect/calldown_attack falling_type = /obj/effect/illusionary_fall @@ -42,4 +38,4 @@ if(!L.apply_damage(35, BRUTE, target_zone, blocked, soaked)) break playsound(src, 'sound/effects/clang2.ogg', 50, 1) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/objects/items/magazine.dm b/code/game/objects/items/magazine.dm index 46db4a95d8..dcbee8327b 100644 --- a/code/game/objects/items/magazine.dm +++ b/code/game/objects/items/magazine.dm @@ -70,7 +70,7 @@ "JOINING THE NAVY? HERE'S 15 EXPERT TIPS FOR AVOIDING BRAIN PARASITES" ) -/obj/item/tabloid/Initialize() +/obj/item/tabloid/Initialize(mapload) . = ..() pixel_x = 5-rand(10) diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 05e86bc0be..ec2062c070 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -195,7 +195,7 @@ return return ..() -/obj/item/kit/suit/rig/debug/Initialize() +/obj/item/kit/suit/rig/debug/Initialize(mapload) set_info("debug suit", "This is a test", "debug", CUSTOM_ITEM_OBJ, CUSTOM_ITEM_MOB) . = ..() diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm index b090cd8d64..4eda3d6446 100644 --- a/code/game/objects/items/stacks/marker_beacons.dm +++ b/code/game/objects/items/stacks/marker_beacons.dm @@ -37,7 +37,7 @@ var/list/marker_beacon_colors = list( /obj/item/stack/marker_beacon/hundred amount = 100 -/obj/item/stack/marker_beacon/Initialize() +/obj/item/stack/marker_beacon/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/stacks/medical_vr.dm b/code/game/objects/items/stacks/medical_vr.dm index 3cc7e2254c..6aa0cab04e 100644 --- a/code/game/objects/items/stacks/medical_vr.dm +++ b/code/game/objects/items/stacks/medical_vr.dm @@ -1,7 +1,7 @@ /obj/item/stack/medical/advanced icon = 'icons/obj/stacks_vr.dmi' -/obj/item/stack/medical/advanced/Initialize() +/obj/item/stack/medical/advanced/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/stacks/tickets.dm b/code/game/objects/items/stacks/tickets.dm index 6681934f7c..652b6c28aa 100644 --- a/code/game/objects/items/stacks/tickets.dm +++ b/code/game/objects/items/stacks/tickets.dm @@ -7,7 +7,7 @@ w_class = ITEMSIZE_TINY max_amount = 30 -/obj/item/stack/arcadeticket/Initialize() +/obj/item/stack/arcadeticket/Initialize(mapload) . = ..() update_icon() @@ -29,4 +29,4 @@ qdel(src) /obj/item/stack/arcadeticket/thirty - amount = 30 \ No newline at end of file + amount = 30 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 5ff9e34ac1..ab92f96d3d 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -32,7 +32,7 @@ var/apply_colour //ChompEDIT -/obj/item/stack/tile/Initialize() +/obj/item/stack/tile/Initialize(mapload) . = ..() randpixel_xy() if(craftable) diff --git a/code/game/objects/items/toys/mech_toys.dm b/code/game/objects/items/toys/mech_toys.dm index 7fb8d8af50..270cb60d6b 100644 --- a/code/game/objects/items/toys/mech_toys.dm +++ b/code/game/objects/items/toys/mech_toys.dm @@ -35,7 +35,7 @@ var/wins = 0 // This mech's win count in combat var/losses = 0 // ...And their loss count in combat -/obj/item/toy/mecha/Initialize() +/obj/item/toy/mecha/Initialize(mapload) . = ..() desc = "Mini-Mecha action figure! Collect them all! Attack your friends or another mech with one to initiate epic mech combat! [desc]." combat_health = max_combat_health diff --git a/code/game/objects/items/trash_material.dm b/code/game/objects/items/trash_material.dm index 6ba36565d6..835e483aed 100644 --- a/code/game/objects/items/trash_material.dm +++ b/code/game/objects/items/trash_material.dm @@ -4,7 +4,7 @@ var/matter_chances = list() //List of lists: list(mat_name, chance, amount) -/obj/item/trash/material/Initialize() +/obj/item/trash/material/Initialize(mapload) . = ..() if(!matter) matter = list() @@ -29,7 +29,7 @@ list(MAT_PLASTEEL, 5, 10) ) -/obj/item/trash/material/metal/Initialize() +/obj/item/trash/material/metal/Initialize(mapload) . = ..() icon_state = "metal[rand(4)]" @@ -48,7 +48,7 @@ list(MAT_DIAMOND, 4, 2), ) -/obj/item/trash/material/circuit/Initialize() +/obj/item/trash/material/circuit/Initialize(mapload) . = ..() icon_state = "circuit[rand(3)]" @@ -67,6 +67,6 @@ list(MAT_DIAMOND, 5, 2), ) -/obj/item/trash/material/device/Initialize() +/obj/item/trash/material/device/Initialize(mapload) . = ..() icon_state = "device[rand(3)]" diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm index 2d51474e58..cc78b5b53b 100644 --- a/code/game/objects/items/uav.dm +++ b/code/game/objects/items/uav.dm @@ -46,7 +46,7 @@ /obj/item/uav/loaded cell_type = /obj/item/cell/high -/obj/item/uav/Initialize() +/obj/item/uav/Initialize(mapload) . = ..() if(!cell && cell_type) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 6c0b0db1ac..cb20fbd0bd 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -270,7 +270,7 @@ AI MODULES origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) // VOREstation edit: use map default laws -/obj/item/aiModule/reset/Initialize() +/obj/item/aiModule/reset/Initialize(mapload) . = ..() laws = new global.using_map.default_law_type // Pull from loaded map diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index e532721fa7..7e8d0e7635 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -30,7 +30,7 @@ var/material_to_use = DEFAULT_WALL_MATERIAL // So badmins can make RCDs that print diamond walls. var/make_rwalls = FALSE // If true, when building walls, they will be reinforced. /* VOREStation Removal - Unused -/obj/item/rcd/Initialize() +/obj/item/rcd/Initialize(mapload) src.spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) @@ -147,7 +147,7 @@ // RCD variants. // This one starts full. -/obj/item/rcd/loaded/Initialize() +/obj/item/rcd/loaded/Initialize(mapload) stored_matter = max_stored_matter return ..() @@ -158,7 +158,7 @@ used in the construction of hulls for starships. Reload with compressed matter cartridges." material_to_use = MAT_STEELHULL -/obj/item/rcd/shipwright/loaded/Initialize() +/obj/item/rcd/shipwright/loaded/Initialize(mapload) stored_matter = max_stored_matter return ..() @@ -172,7 +172,7 @@ toolspeed = 0.5 // Twice as fast. max_stored_matter = RCD_MAX_CAPACITY * 3 // Three times capacity. -/obj/item/rcd/advanced/loaded/Initialize() +/obj/item/rcd/advanced/loaded/Initialize(mapload) stored_matter = max_stored_matter return ..() @@ -189,7 +189,7 @@ var/make_cell = TRUE // If false, initialize() won't spawn a cell for this. var/electric_cost_coefficent = 83.33 // Higher numbers make it less efficent. 86.3... means it should matche the standard RCD capacity on a 10k cell. -/obj/item/rcd/electric/Initialize() +/obj/item/rcd/electric/Initialize(mapload) if(make_cell) cell = new /obj/item/cell/high(src) return ..() diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm index 5f52b97e20..9f943cf4b6 100644 --- a/code/game/objects/items/weapons/RCD_vr.dm +++ b/code/game/objects/items/weapons/RCD_vr.dm @@ -26,7 +26,7 @@ slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi', ) -/obj/item/rcd/Initialize() +/obj/item/rcd/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm index d2ce8fea55..cd70b29458 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -44,7 +44,7 @@ var/static/image/radial_image_random = image(icon = 'icons/mob/radial_vr.dmi', icon_state = "sheet-random") -/obj/item/rms/Initialize() +/obj/item/rms/Initialize(mapload) . = ..() src.spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index 2c5ba3e222..da36d16046 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -44,7 +44,7 @@ "Aux" = PIPING_LAYER_AUX ) -/obj/item/pipe_dispenser/Initialize() +/obj/item/pipe_dispenser/Initialize(mapload) . = ..() src.spark_system = new /datum/effect/effect/system/spark_spread spark_system.set_up(5, 0, src) diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index ce93d023d2..4baf068986 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -112,13 +112,13 @@ /obj/item/flame/candle/everburn wax = 99999 -/obj/item/flame/candle/everburn/Initialize() +/obj/item/flame/candle/everburn/Initialize(mapload) . = ..() light(span_notice("\The [src] mysteriously lights itself!.")) /obj/item/flame/candle/candelabra/everburn wax = 99999 -/obj/item/flame/candle/candelabra/everburn/Initialize() +/obj/item/flame/candle/candelabra/everburn/Initialize(mapload) . = ..() light(span_notice("\The [src] mysteriously lights itself!.")) diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm index 7b03289ea8..b968f0654a 100644 --- a/code/game/objects/items/weapons/canes.dm +++ b/code/game/objects/items/weapons/canes.dm @@ -22,7 +22,7 @@ /obj/item/cane/concealed var/concealed_blade -/obj/item/cane/concealed/Initialize() +/obj/item/cane/concealed/Initialize(mapload) . = ..() var/obj/item/material/butterfly/switchblade/temp_blade = new(src) concealed_blade = temp_blade diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm index 495e67c78c..c640eb21e6 100644 --- a/code/game/objects/items/weapons/capture_crystal.dm +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -20,7 +20,7 @@ var/full_icon = "full" var/capture_chance_modifier = 1 //So we can have special subtypes with different capture rates! -/obj/item/capture_crystal/Initialize() +/obj/item/capture_crystal/Initialize(mapload) . = ..() update_icon() @@ -854,7 +854,7 @@ list(/mob/living/simple_mob/vore/devil) ) -/obj/item/capture_crystal/random/Initialize() +/obj/item/capture_crystal/random/Initialize(mapload) var/subchoice = pickweight(possible_mob_types) //Some of the lists have nested lists, so let's pick one of them var/choice = pickweight(subchoice) //And then we'll pick something from whatever's left spawn_mob_type = choice //Now when someone uses this, we'll spawn whatever we picked! diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index dc9729d761..8d7dc52d85 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -25,7 +25,7 @@ if(wrapped) add_overlay("[initial(icon_state)]_wrapper") -/obj/item/clothing/mask/chewable/Initialize() +/obj/item/clothing/mask/chewable/Initialize(mapload) . = ..() flags |= NOREACT // so it doesn't react until you light it create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 @@ -118,7 +118,7 @@ type_butt = /obj/item/trash/spitgum wrapped = TRUE -/obj/item/clothing/mask/chewable/tobacco/nico/Initialize() +/obj/item/clothing/mask/chewable/tobacco/nico/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NICOTINE, 2) color = reagents.get_color() @@ -136,7 +136,7 @@ slot_flags = SLOT_BELT starts_with = list(/obj/item/clothing/mask/chewable/tobacco = 6) -/obj/item/storage/chewables/Initialize() +/obj/item/storage/chewables/Initialize(mapload) . = ..() make_exact_fit() @@ -224,7 +224,7 @@ item_state = "gum" wrapped = TRUE -/obj/item/clothing/mask/chewable/candy/gum/Initialize() +/obj/item/clothing/mask/chewable/candy/gum/Initialize(mapload) . = ..() reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),10) color = reagents.get_color() @@ -333,7 +333,7 @@ // CHOMPAdd End -/obj/item/clothing/mask/chewable/candy/lolli/Initialize() +/obj/item/clothing/mask/chewable/candy/lolli/Initialize(mapload) . = ..() reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),20) color = reagents.get_color() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 65b787048c..b667bf6921 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -101,7 +101,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM blood_sprite_state = null //Can't bloody these drop_sound = 'sound/items/cigs_lighters/cig_snuff.ogg' -/obj/item/clothing/mask/smokable/Initialize() +/obj/item/clothing/mask/smokable/Initialize(mapload) . = ..() flags |= NOREACT // so it doesn't react until you light it create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 @@ -295,7 +295,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM weldermes = span_notice("USER casually lights the NAME with FLAME.") ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME.") -/obj/item/clothing/mask/smokable/cigarette/Initialize() +/obj/item/clothing/mask/smokable/cigarette/Initialize(mapload) . = ..() if(nicotine_amt) reagents.add_reagent(REAGENT_ID_NICOTINE, nicotine_amt) @@ -393,7 +393,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM slot_flags = SLOT_EARS throwforce = 1 -/obj/item/trash/cigbutt/Initialize() +/obj/item/trash/cigbutt/Initialize(mapload) . = ..() randpixel_xy() transform = turn(transform,rand(0,360)) @@ -430,7 +430,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME with the power of science.") is_pipe = 1 -/obj/item/clothing/mask/smokable/pipe/Initialize() +/obj/item/clothing/mask/smokable/pipe/Initialize(mapload) . = ..() name = "empty [initial(name)]" @@ -618,7 +618,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/flame/lighter/random // Randomizes Cheap Lighters on Spawn -/obj/item/flame/lighter/Initialize() +/obj/item/flame/lighter/Initialize(mapload) . = ..() var/image/I = image(icon, "lighter-[pick("trans","tall","matte")]") I.color = pick(available_colors) @@ -683,7 +683,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM activation_sound = 'sound/items/zippo_on.ogg' deactivation_sound = 'sound/items/zippo_off.ogg' -/obj/item/flame/lighter/zippo/Initialize() +/obj/item/flame/lighter/zippo/Initialize(mapload) . = ..() cut_overlays() //Prevents the Cheap Lighter overlay from appearing on this diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm index 32320f11f1..fdaf446bf2 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -10,7 +10,7 @@ var/locked = 1 var/emagged = 0 -/obj/item/circuitboard/security/Initialize() +/obj/item/circuitboard/security/Initialize(mapload) . = ..() network = using_map.station_networks @@ -23,7 +23,7 @@ build_path = /obj/machinery/computer/security/engineering req_access = list() -/obj/item/circuitboard/security/engineering/Initialize() +/obj/item/circuitboard/security/engineering/Initialize(mapload) . = ..() network = engineering_networks @@ -39,7 +39,7 @@ board_type = new /datum/frame/frame_types/display matter = list(MAT_STEEL = 50, MAT_GLASS = 50) -/obj/item/circuitboard/security/telescreen/entertainment/Initialize() +/obj/item/circuitboard/security/telescreen/entertainment/Initialize(mapload) . = ..() network = NETWORK_THUNDER diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 78b902dda1..75c243569f 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -100,7 +100,7 @@ icon_state = "trinketbox" var/datum/tgui_module/appearance_changer/mirror/coskit/M -/obj/item/makeover/Initialize() +/obj/item/makeover/Initialize(mapload) . = ..() M = new(src, null) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 00487c1925..130fab41cc 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -20,7 +20,7 @@ var/has_radiation = TRUE // Traitgenes edit end -/obj/item/dnainjector/Initialize() // Traitgenes edit - Moved to init +/obj/item/dnainjector/Initialize(mapload) // Traitgenes edit - Moved to init if(datatype && block) buf=new buf.dna=new @@ -168,54 +168,54 @@ desc = "This injects the person with DNA." // Purely rando -/obj/item/dnainjector/random/Initialize() +/obj/item/dnainjector/random/Initialize(mapload) pick_block( pick(GLOB.dna_genes_good + GLOB.dna_genes_neutral + GLOB.dna_genes_bad), FALSE, TRUE) . = ..() -/obj/item/dnainjector/random_labeled/Initialize() +/obj/item/dnainjector/random_labeled/Initialize(mapload) pick_block( pick(GLOB.dna_genes_good + GLOB.dna_genes_neutral + GLOB.dna_genes_bad), TRUE, TRUE) . = ..() // Good/bad but also neutral genes mixed in, less OP selection of genes -/obj/item/dnainjector/random_good/Initialize() +/obj/item/dnainjector/random_good/Initialize(mapload) pick_block( pick(GLOB.dna_genes_good + GLOB.dna_genes_neutral ), FALSE, TRUE) . = ..() -/obj/item/dnainjector/random_good_labeled/Initialize() +/obj/item/dnainjector/random_good_labeled/Initialize(mapload) pick_block( pick(GLOB.dna_genes_good + GLOB.dna_genes_neutral ), TRUE, TRUE) . = ..() -/obj/item/dnainjector/random_bad/Initialize() +/obj/item/dnainjector/random_bad/Initialize(mapload) pick_block( pick(GLOB.dna_genes_bad + GLOB.dna_genes_neutral ), FALSE, TRUE) . = ..() -/obj/item/dnainjector/random_bad_labeled/Initialize() +/obj/item/dnainjector/random_bad_labeled/Initialize(mapload) pick_block( pick(GLOB.dna_genes_bad + GLOB.dna_genes_neutral ), TRUE, TRUE) . = ..() // Purely good/bad genes, intended to be usually good rewards or punishments -/obj/item/dnainjector/random_verygood/Initialize() +/obj/item/dnainjector/random_verygood/Initialize(mapload) pick_block( pick(GLOB.dna_genes_good), FALSE, FALSE) . = ..() -/obj/item/dnainjector/random_verygood_labeled/Initialize() +/obj/item/dnainjector/random_verygood_labeled/Initialize(mapload) pick_block( pick(GLOB.dna_genes_good), TRUE, FALSE) . = ..() -/obj/item/dnainjector/random_verybad/Initialize() +/obj/item/dnainjector/random_verybad/Initialize(mapload) pick_block( pick(GLOB.dna_genes_bad), FALSE, FALSE) . = ..() -/obj/item/dnainjector/random_verybad_labeled/Initialize() +/obj/item/dnainjector/random_verybad_labeled/Initialize(mapload) pick_block( pick(GLOB.dna_genes_bad), TRUE, FALSE) . = ..() // Random neutral traits -/obj/item/dnainjector/random_neutral/Initialize() +/obj/item/dnainjector/random_neutral/Initialize(mapload) pick_block( pick(GLOB.dna_genes_neutral ), FALSE, TRUE) . = ..() -/obj/item/dnainjector/random_neutral_labeled/Initialize() +/obj/item/dnainjector/random_neutral_labeled/Initialize(mapload) pick_block( pick(GLOB.dna_genes_neutral ), TRUE, TRUE) . = ..() @@ -224,7 +224,7 @@ var/trait_path var/disabling = FALSE -/obj/item/dnainjector/set_trait/Initialize() +/obj/item/dnainjector/set_trait/Initialize(mapload) var/G = get_gene_from_trait(trait_path) if(trait_path && G) pick_block( G, TRUE, FALSE, disabling) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 352b367a30..b5b92b43a5 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -50,7 +50,7 @@ sprite_name = "atmos_extinguisher" rand_overlays = 0 -/obj/item/extinguisher/Initialize() +/obj/item/extinguisher/Initialize(mapload) create_reagents(max_water) reagents.add_reagent(REAGENT_ID_FIREFOAM, max_water) if(rand_overlays) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 4055039a99..1568604f52 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -18,7 +18,7 @@ var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle) var/affected_area = 3 -/obj/item/grenade/chem_grenade/Initialize() +/obj/item/grenade/chem_grenade/Initialize(mapload) . = ..() create_reagents(1000) @@ -208,7 +208,7 @@ stage = 2 sealed = TRUE -/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) @@ -230,7 +230,7 @@ stage = 2 sealed = TRUE -/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) @@ -253,7 +253,7 @@ stage = 2 sealed = TRUE -/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) @@ -277,7 +277,7 @@ path = 1 sealed = TRUE -/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) @@ -299,7 +299,7 @@ path = 1 sealed = TRUE -/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) diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 77092ebea1..a3f7a125b3 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -275,7 +275,7 @@ name = "Robot Miner ID" rank = JOB_SHAFT_MINER -/obj/item/card/id/cargo/miner/borg/Initialize() +/obj/item/card/id/cargo/miner/borg/Initialize(mapload) . = ..() if(isrobot(loc?.loc)) R = loc.loc diff --git a/code/game/objects/items/weapons/id cards/cards_vr.dm b/code/game/objects/items/weapons/id cards/cards_vr.dm index fb328f0772..109ff18fe1 100644 --- a/code/game/objects/items/weapons/id cards/cards_vr.dm +++ b/code/game/objects/items/weapons/id cards/cards_vr.dm @@ -5,6 +5,6 @@ /obj/item/card/emag/used uses = 1 -/obj/item/card/emag/used/Initialize() +/obj/item/card/emag/used/Initialize(mapload) . = ..() uses = rand(1, 5) diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index 914caaf0a0..20548d5f85 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -296,7 +296,7 @@ name = "Robot Exploration ID" rank = JOB_EXPLORER -/obj/item/card/id/exploration/borg/Initialize() +/obj/item/card/id/exploration/borg/Initialize(mapload) . = ..() if(isrobot(loc?.loc)) R = loc.loc diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 332b3e83d3..7aab197141 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -131,7 +131,7 @@ return ..() -/obj/item/card/id/Initialize() +/obj/item/card/id/Initialize(mapload) . = ..() var/datum/job/J = job_master.GetJob(rank) if(J) @@ -170,7 +170,7 @@ item_state = "idgreen" assignment = "Synthetic" -/obj/item/card/id/synthetic/Initialize() +/obj/item/card/id/synthetic/Initialize(mapload) . = ..() access = get_all_station_access().Copy() + access_synth @@ -180,7 +180,7 @@ icon_state = "id-robot-n" assignment = "Lost" -/obj/item/card/id/lost/Initialize() +/obj/item/card/id/lost/Initialize(mapload) . = ..() access += access_lost @@ -203,11 +203,11 @@ registered_name = "Central Command" assignment = "General" -/obj/item/card/id/centcom/Initialize() +/obj/item/card/id/centcom/Initialize(mapload) . = ..() access = get_all_centcom_access().Copy() -/obj/item/card/id/centcom/station/Initialize() +/obj/item/card/id/centcom/station/Initialize(mapload) . = ..() access |= get_all_station_access() @@ -217,7 +217,7 @@ icon_state = "ert-id" rank = JOB_EMERGENCY_RESPONSE_TEAM -/obj/item/card/id/centcom/ERT/Initialize() +/obj/item/card/id/centcom/ERT/Initialize(mapload) . = ..() access |= get_all_station_access() diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm index b6fe6fe37c..dbb30f99e5 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -8,12 +8,12 @@ var/datum/tgui_module/agentcard/agentcard_module -/obj/item/card/id/syndicate/Initialize() +/obj/item/card/id/syndicate/Initialize(mapload) . = ..() agentcard_module = new(src) access = syndicate_access.Copy() -/obj/item/card/id/syndicate/station_access/Initialize() +/obj/item/card/id/syndicate/station_access/Initialize(mapload) . = ..() // Same as the normal Syndicate id, only already has all station access access |= get_all_station_access() diff --git a/code/game/objects/items/weapons/inducer_vr.dm b/code/game/objects/items/weapons/inducer_vr.dm index d4f52cd911..4a99c605a8 100644 --- a/code/game/objects/items/weapons/inducer_vr.dm +++ b/code/game/objects/items/weapons/inducer_vr.dm @@ -23,7 +23,7 @@ cell_type = null opened = TRUE -/obj/item/inducer/Initialize() +/obj/item/inducer/Initialize(mapload) . = ..() if(!cell && cell_type) cell = new cell_type @@ -224,7 +224,7 @@ powertransfer = 500 opened = TRUE -/obj/item/inducer/sci/Initialize() +/obj/item/inducer/sci/Initialize(mapload) . = ..() update_icon() //To get the 'open' state applied diff --git a/code/game/objects/items/weapons/manuals_vr.dm b/code/game/objects/items/weapons/manuals_vr.dm index 874fe10574..189f1c194a 100644 --- a/code/game/objects/items/weapons/manuals_vr.dm +++ b/code/game/objects/items/weapons/manuals_vr.dm @@ -6,7 +6,7 @@ author = "NanoTrasen" title = "Standard Operating Procedure" -/obj/item/book/manual/standard_operating_procedure/Initialize() +/obj/item/book/manual/standard_operating_procedure/Initialize(mapload) . = ..() dat = {" @@ -29,7 +29,7 @@ author = "Jeremiah Acacius" title = "Corporate Regulations" -/obj/item/book/manual/command_guide/Initialize() +/obj/item/book/manual/command_guide/Initialize(mapload) . = ..() dat = {" @@ -53,7 +53,7 @@ author = "Ali Big" title = "Food for Dummies 2" -/obj/item/book/manual/cook_guide/Initialize() +/obj/item/book/manual/cook_guide/Initialize(mapload) . = ..() dat = {" @@ -137,7 +137,7 @@ author = "Ali Big" title = "How to Alcohol (And other Drinks)" -/obj/item/book/manual/bar_guide/Initialize() +/obj/item/book/manual/bar_guide/Initialize(mapload) . = ..() dat = {" @@ -350,7 +350,7 @@ author = "Engineering Encyclopedia" title = "Rotary Electric Generator Manual" -/obj/item/book/manual/rotary_electric_generator/Initialize() +/obj/item/book/manual/rotary_electric_generator/Initialize(mapload) . = ..() dat = {" @@ -447,7 +447,7 @@ author = "Pontifex Publishing" title = "Synthetics" -/obj/item/book/manual/synthetic_life/Initialize() +/obj/item/book/manual/synthetic_life/Initialize(mapload) . = ..() dat = {" diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index c00b526151..1fa756c8e6 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -12,7 +12,7 @@ var/active_force = 55 var/inactive_force = 10 -/obj/item/chainsaw/Initialize() +/obj/item/chainsaw/Initialize(mapload) var/datum/reagents/R = new/datum/reagents(max_fuel) reagents = R R.my_atom = src diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 041446323c..f6b166fd5f 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -21,7 +21,7 @@ var/list/food_inserted_micros -/obj/item/material/kitchen/utensil/Initialize() +/obj/item/material/kitchen/utensil/Initialize(mapload) . = ..() if (prob(60)) src.pixel_y = rand(0, 4) diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index 23ba57513a..7061757b09 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -26,7 +26,7 @@ var/global/list/cached_icons = list() else return ..() -/obj/item/reagent_containers/glass/paint/Initialize() +/obj/item/reagent_containers/glass/paint/Initialize(mapload) .=..() if(paint_type) reagents.add_reagent(REAGENT_ID_PAINT, volume, paint_type) diff --git a/code/game/objects/items/weapons/picnic_blankets.dm b/code/game/objects/items/weapons/picnic_blankets.dm index a69ed40951..c6e63fdc72 100644 --- a/code/game/objects/items/weapons/picnic_blankets.dm +++ b/code/game/objects/items/weapons/picnic_blankets.dm @@ -114,7 +114,7 @@ var/unfoldable = FALSE -/obj/structure/picnic_blanket_deployed/for_mapping_use/Initialize() +/obj/structure/picnic_blanket_deployed/for_mapping_use/Initialize(mapload) . = ..() unfold() if(unfoldable) diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm index b930d0655b..a45d44b1cc 100644 --- a/code/game/objects/items/weapons/policetape.dm +++ b/code/game/objects/items/weapons/policetape.dm @@ -14,7 +14,7 @@ var/apply_tape = FALSE -/obj/item/taperoll/Initialize() +/obj/item/taperoll/Initialize(mapload) . = ..() if(apply_tape) var/turf/T = get_turf(src) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 1f015cb73b..8cdc2bc892 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -58,7 +58,7 @@ var/tilted = 0 icon_state = "holdingduffle" -/obj/item/storage/backpack/holding/duffle/Initialize() +/obj/item/storage/backpack/holding/duffle/Initialize(mapload) . = ..() if(prob(50)) icon_state = "[icon_state]_tilted" @@ -184,7 +184,7 @@ var/can_tilt = 1 max_storage_space = INVENTORY_DUFFLEBAG_SPACE -/obj/item/storage/backpack/dufflebag/Initialize() +/obj/item/storage/backpack/dufflebag/Initialize(mapload) . = ..() if(prob(50)) icon_state = "[icon_state]_tilted" diff --git a/code/game/objects/items/weapons/storage/egg_vr.dm b/code/game/objects/items/weapons/storage/egg_vr.dm index bea3b21e5f..fffa725c50 100644 --- a/code/game/objects/items/weapons/storage/egg_vr.dm +++ b/code/game/objects/items/weapons/storage/egg_vr.dm @@ -17,7 +17,7 @@ use_sound = 'sound/items/drop/flesh.ogg' var/egg_name = null //CHOMPAdd -/obj/item/storage/vore_egg/Initialize() +/obj/item/storage/vore_egg/Initialize(mapload) . = ..() randpixel_xy() diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 15f84bfa0c..adb622d11b 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -156,7 +156,7 @@ /obj/item/pen/crayon/purple ) -/obj/item/storage/fancy/crayons/Initialize() +/obj/item/storage/fancy/crayons/Initialize(mapload) . = ..() update_icon() @@ -198,7 +198,7 @@ /obj/item/pen/crayon/marker/purple ) -/obj/item/storage/fancy/markers/Initialize() +/obj/item/storage/fancy/markers/Initialize(mapload) . = ..() update_icon() @@ -253,7 +253,7 @@ starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 6) var/brand = "\improper Trans-Stellar Duty-free" -/obj/item/storage/fancy/cigarettes/Initialize() +/obj/item/storage/fancy/cigarettes/Initialize(mapload) . = ..() flags |= NOREACT create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one @@ -263,7 +263,7 @@ C.brand = brand C.desc += " This one is \a [brand]." -/obj/item/storage/fancy/cigarettes/Initialize() +/obj/item/storage/fancy/cigarettes/Initialize(mapload) . = ..() if(!open_state) open_state = "[initial(icon_state)]_open" @@ -399,7 +399,7 @@ icon_type = "cigar" starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 5) -/obj/item/storage/fancy/cigar/Initialize() +/obj/item/storage/fancy/cigar/Initialize(mapload) . = ..() flags |= NOREACT create_reagents(15 * storage_slots) @@ -410,7 +410,7 @@ reagents.trans_to_obj(C, (reagents.total_volume/contents.len)) return ..() -/obj/item/storage/fancy/cigar/Initialize() +/obj/item/storage/fancy/cigar/Initialize(mapload) . = ..() if(!open_state) open_state = "[initial(icon_state)]0" @@ -507,7 +507,7 @@ storage_slots = 6 req_access = list(access_virology) -/obj/item/storage/lockbox/vials/Initialize() +/obj/item/storage/lockbox/vials/Initialize(mapload) . = ..() update_icon() @@ -550,7 +550,7 @@ /obj/item/reagent_containers/food/snacks/chocolatepiece/truffle ) -/obj/item/storage/fancy/heartbox/Initialize() +/obj/item/storage/fancy/heartbox/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 841f55cb22..c305f2e50f 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -19,7 +19,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/storage/firstaid/Initialize() +/obj/item/storage/firstaid/Initialize(mapload) . = ..() if(icon_variety) icon_state = pick(icon_variety) @@ -193,7 +193,7 @@ var/base_name = " " var/base_desc = " " -/obj/item/storage/pill_bottle/Initialize() +/obj/item/storage/pill_bottle/Initialize(mapload) . = ..() base_name = name base_desc = desc diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index e722bfa65b..5d048213d2 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -40,7 +40,7 @@ var/list/random_weighted_donuts = list( foldable = /obj/item/stack/material/cardboard //starts_with = list(/obj/item/reagent_containers/food/snacks/donut/normal = 6) -/obj/item/storage/box/donut/Initialize() +/obj/item/storage/box/donut/Initialize(mapload) if(!empty) for(var/i in 1 to 6) var/type_to_spawn = pickweight(random_weighted_donuts) @@ -73,7 +73,7 @@ var/list/random_weighted_donuts = list( ) starts_with = list(/obj/item/reagent_containers/food/snacks/worm = 6) -/obj/item/storage/box/wormcan/Initialize() +/obj/item/storage/box/wormcan/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index ff9a02dca9..d581644246 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -223,7 +223,7 @@ MRE Stuff var/opened = FALSE starts_with = list(/obj/item/reagent_containers/food/snacks/slice/meatpizza/filled) -/obj/item/storage/mrebag/Initialize() +/obj/item/storage/mrebag/Initialize(mapload) . = ..() /obj/item/storage/mrebag/update_icon() @@ -302,7 +302,7 @@ MRE Stuff foldable = null var/isopened = 0 -/obj/item/storage/box/tgmc_mre/Initialize() +/obj/item/storage/box/tgmc_mre/Initialize(mapload) . = ..() pickflavor() diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 8ea5c0f432..b3571195f0 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -33,7 +33,7 @@ /obj/item/extinguisher/mini, /obj/item/radio ) -/obj/item/storage/toolbox/emergency/Initialize() +/obj/item/storage/toolbox/emergency/Initialize(mapload) if(prob(50)) new /obj/item/flashlight(src) else @@ -69,7 +69,7 @@ /obj/item/stack/cable_coil/random_belt, /obj/item/stack/cable_coil/random_belt ) -/obj/item/storage/toolbox/electrical/Initialize() +/obj/item/storage/toolbox/electrical/Initialize(mapload) . = ..() if(prob(5)) new /obj/item/clothing/gloves/yellow(src) @@ -151,7 +151,7 @@ var/filled = FALSE attack_verb = list("lunched") -/obj/item/storage/toolbox/lunchbox/Initialize() +/obj/item/storage/toolbox/lunchbox/Initialize(mapload) if(filled) var/list/lunches = lunchables_lunches() var/lunch = lunches[pick(lunches)] diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 9fc8936d0b..f5e476d12e 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -1,4 +1,4 @@ -/obj/item/storage/box/syndicate/Initialize() +/obj/item/storage/box/syndicate/Initialize(mapload) switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1, "smoothoperator" = 1))) if("bloodyspai") new /obj/item/clothing/under/chameleon(src) @@ -70,7 +70,7 @@ /obj/item/storage/box/syndie_kit/imp_freedom name = "boxed freedom implant (with injector)" -/obj/item/storage/box/syndie_kit/imp_freedom/Initialize() +/obj/item/storage/box/syndie_kit/imp_freedom/Initialize(mapload) var/obj/item/implanter/O = new(src) O.imp = new /obj/item/implant/freedom(O) O.update() @@ -87,7 +87,7 @@ /obj/item/storage/box/syndie_kit/imp_uplink name = "boxed uplink implant (with injector)" -/obj/item/storage/box/syndie_kit/imp_uplink/Initialize() +/obj/item/storage/box/syndie_kit/imp_uplink/Initialize(mapload) var/obj/item/implanter/O = new(src) O.imp = new /obj/item/implant/uplink(O) O.update() @@ -97,7 +97,7 @@ name = "boxed augment implant (with injector)" var/case_type = /obj/item/implantcase/shades -/obj/item/storage/box/syndie_kit/imp_aug/Initialize() +/obj/item/storage/box/syndie_kit/imp_aug/Initialize(mapload) new /obj/item/implanter(src) new case_type(src) . = ..() @@ -191,7 +191,7 @@ name = "\improper Tricky smokes" desc = "Comes with the following brands of cigarettes, in this order: 2xFlash, 2xSmoke, 1xMindBreaker, 1xTricordrazine. Avoid mixing them up." -/obj/item/storage/box/syndie_kit/cigarette/Initialize() +/obj/item/storage/box/syndie_kit/cigarette/Initialize(mapload) . = ..() var/obj/item/storage/fancy/cigarettes/pack diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index c825e71a64..a33aa3d007 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -19,7 +19,7 @@ var/volume_rate = 500 //Needed for borg jetpack transfer actions_types = list(/datum/action/item_action/toggle_jetpack) -/obj/item/tank/jetpack/Initialize() +/obj/item/tank/jetpack/Initialize(mapload) . = ..() ion_trail = new /datum/effect/effect/system/ion_trail_follow() ion_trail.set_up(src) @@ -90,7 +90,7 @@ icon_state = "jetpack-void" item_state_slots = list(slot_r_hand_str = "jetpack-void", slot_l_hand_str = "jetpack-void") -/obj/item/tank/jetpack/void/Initialize() +/obj/item/tank/jetpack/void/Initialize(mapload) . = ..() air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -100,7 +100,7 @@ icon_state = "jetpack" item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack") -/obj/item/tank/jetpack/oxygen/Initialize() +/obj/item/tank/jetpack/oxygen/Initialize(mapload) . = ..() air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -110,7 +110,7 @@ icon_state = "jetpack-breaker" item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack") -/obj/item/tank/jetpack/breaker/Initialize() +/obj/item/tank/jetpack/breaker/Initialize(mapload) . = ..() air_contents.adjust_gas(GAS_VOLATILE_FUEL, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -121,7 +121,7 @@ icon_state = "jetpack-black" item_state_slots = list(slot_r_hand_str = "jetpack-black", slot_l_hand_str = "jetpack-black") -/obj/item/tank/jetpack/carbondioxide/Initialize() +/obj/item/tank/jetpack/carbondioxide/Initialize(mapload) . = ..() air_contents.adjust_gas(GAS_CO2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 0c18beafea..a89a050913 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -16,7 +16,7 @@ icon_state = "oxygen" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/tank/oxygen/Initialize() +/obj/item/tank/oxygen/Initialize(mapload) . = ..() air_contents.adjust_gas(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -41,7 +41,7 @@ desc = "A tank with an N2O/O2 gas mix." icon_state = "anesthetic" -/obj/item/tank/anesthetic/Initialize() +/obj/item/tank/anesthetic/Initialize(mapload) . = ..() air_contents.gas[GAS_O2] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD @@ -62,7 +62,7 @@ . += span_warning("The meter on \the [src] indicates you are almost out of air!") user << sound('sound/effects/alert.ogg') -/obj/item/tank/air/Initialize() +/obj/item/tank/air/Initialize(mapload) . = ..() src.air_contents.adjust_multi(GAS_O2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD, GAS_N2, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD) @@ -76,7 +76,7 @@ gauge_icon = null slot_flags = null //they have no straps! -/obj/item/tank/phoron/Initialize() +/obj/item/tank/phoron/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_PHORON, (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)) @@ -100,7 +100,7 @@ distribute_pressure = ONE_ATMOSPHERE*O2STANDARD slot_flags = SLOT_BACK //these ones have straps! -/obj/item/tank/vox/Initialize() +/obj/item/tank/vox/Initialize(mapload) . = ..() air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //VOREStation Edit @@ -109,7 +109,7 @@ icon_state = "phoron_vox" w_class = ITEMSIZE_NORMAL -/obj/item/tank/phoron/pressurized/Initialize() +/obj/item/tank/phoron/pressurized/Initialize(mapload) . = ..() adjust_scale(0.8) air_contents.adjust_gas(GAS_PHORON, (7*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -135,7 +135,7 @@ icon_state = "emergency" gauge_icon = "indicator_smalltank" // CHOMP EDIT fixes indicator to ensure there's never a buggy outcome -/obj/item/tank/emergency/oxygen/Initialize() +/obj/item/tank/emergency/oxygen/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_O2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -164,7 +164,7 @@ gauge_icon = "indicator_stasis" // CHOMP ADD volume = 10 -/obj/item/tank/stasis/oxygen/Initialize() +/obj/item/tank/stasis/oxygen/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_O2, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -174,7 +174,7 @@ icon_state = "emergency_nitrogen" // :) gauge_icon = "indicator_smalltank" // :) -/obj/item/tank/emergency/nitrogen/Initialize() +/obj/item/tank/emergency/nitrogen/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_N2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -190,7 +190,7 @@ icon_state = "emergency_phoron_vox" // And you get a unique sprite! gauge_icon = "indicator_smalltank" // Look under your chairs! You all get unique sprites! -/obj/item/tank/emergency/phoron/Initialize() +/obj/item/tank/emergency/phoron/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -207,7 +207,7 @@ icon_state = "emergency_double" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/tank/carbon_dioxide/Initialize() +/obj/item/tank/carbon_dioxide/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_CO2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -218,7 +218,7 @@ slot_flags = SLOT_BELT distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/tank/emergency/carbon_dioxide/Initialize() +/obj/item/tank/emergency/carbon_dioxide/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_CO2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) @@ -228,7 +228,7 @@ icon_state = "emergency_double" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/tank/emergency/carbon_dioxide/double/Initialize() +/obj/item/tank/emergency/carbon_dioxide/double/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_CO2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //CHOMPEdit End @@ -242,7 +242,7 @@ icon_state = "oxygen_fr" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/tank/nitrogen/Initialize() +/obj/item/tank/nitrogen/Initialize(mapload) . = ..() src.air_contents.adjust_gas(GAS_N2, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) //CHOMPedit @@ -260,6 +260,6 @@ gauge_icon = "indicator_stasis" // CHOMP ADD volume = 10 -/obj/item/tank/stasis/nitro_cryo/Initialize() +/obj/item/tank/stasis/nitro_cryo/Initialize(mapload) . = ..() src.air_contents.adjust_gas_temp(GAS_N2, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*TN60C), TN60C) diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm index 032c01ec39..17a839b34f 100644 --- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm +++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm @@ -8,7 +8,7 @@ gauge_cap = 3 volume = 12 // CHOMP EDIT double extended -/obj/item/tank/emergency/phoron/double/Initialize() +/obj/item/tank/emergency/phoron/double/Initialize(mapload) . = ..() air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 55b0a329c9..3b895b2299 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -57,7 +57,7 @@ var/list/global/tank_gauge_cache = list() src.proxyassembly = proxy -/obj/item/tank/Initialize() +/obj/item/tank/Initialize(mapload) . = ..() src.init_proxy() diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index aae9e2de19..c29a03bbef 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -679,7 +679,7 @@ eye_safety_modifier = 2 always_process = TRUE -/obj/item/weldingtool/electric/mounted/exosuit/Initialize() +/obj/item/weldingtool/electric/mounted/exosuit/Initialize(mapload) . = ..() if(istype(loc, /obj/item/mecha_parts/mecha_equipment)) diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index 0798fc9d54..09c2849dd4 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -12,7 +12,7 @@ drop_sound = 'sound/items/drop/backpack.ogg' pickup_sound = 'sound/items/pickup/backpack.ogg' -/obj/item/weldpack/Initialize() +/obj/item/weldpack/Initialize(mapload) . = ..() var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills reagents = R diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm index 339ae5f5b3..9e4d451e2f 100644 --- a/code/game/objects/mail.dm +++ b/code/game/objects/mail.dm @@ -61,7 +61,7 @@ stamp_max = 2 stamp_offset_y = 5 -/obj/item/mail/Initialize() +/obj/item/mail/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) @@ -306,7 +306,7 @@ points_per_crate = 0 closet_appearance = /decl/closet_appearance/crate/nanotrasen -/obj/structure/closet/crate/mail/full/Initialize() +/obj/structure/closet/crate/mail/full/Initialize(mapload) . = ..() var/list/mail_recipients = list() for(var/mob/living/carbon/human/alive in player_list) @@ -412,7 +412,7 @@ // JUNK MAIL STUFF -/obj/item/mail/junkmail/Initialize() +/obj/item/mail/junkmail/Initialize(mapload) . = ..() junk_mail() @@ -469,7 +469,7 @@ update_icon() return TRUE -/obj/item/paper/fluff/junkmail_generic/Initialize() +/obj/item/paper/fluff/junkmail_generic/Initialize(mapload) . = ..() info = pick( prob(5);"Hello! I am executive at Nanotrasen Nigel Takall. Due to accounting error all of my salary is stored in an account unreachable. In order to withdraw I am required to utilize your account to make a deposit to confirm my reality situation. In exchange for a temporary deposit I will give you a payment 1000 credits. All I need is access to your account. Will you be assistant please?", @@ -492,7 +492,7 @@ name = "smudged paper" icon_state = "scrap" -/obj/item/paper/fluff/junkmail_redpill/Initialize() +/obj/item/paper/fluff/junkmail_redpill/Initialize(mapload) . = ..() info = "You need to escape the simulation. Don't forget the numbers, they help you remember: '[rand(0,9)]*[rand(0,9)][rand(0,9)]...'" @@ -500,7 +500,7 @@ name = "love letter" icon_state = "paper_words" -/obj/item/paper/fluff/love_letter/Initialize() +/obj/item/paper/fluff/love_letter/Initialize(mapload) . = ..() info = "I HATE CARGO MAIL\n\"GRAA LEMME BREAK YOUR DOORS DOWN I GOTTA GIVE YOU MAIL\nREE YOU GOTTA GET YOUR MAIL I SORTED IT\nYOU'RE WASTIN YOUR TIME IF YOU DONT GET MAIL YOU NEED TO GET YOUR MAIL NOW\nWHY ARENT YO UGETTING YOUR MAIL RAAA\"" diff --git a/code/game/objects/micro_event.dm b/code/game/objects/micro_event.dm index 9ca5f485e5..13f2214191 100644 --- a/code/game/objects/micro_event.dm +++ b/code/game/objects/micro_event.dm @@ -76,7 +76,7 @@ var/ourtime = (((start_time + time_til_open) - world.time) / 600) . += span_notice("It will open in [ourtime] minutes!") -/obj/structure/timer_door/Initialize() +/obj/structure/timer_door/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm index 20386edd7f..1b0ace3435 100644 --- a/code/game/objects/micro_structures.dm +++ b/code/game/objects/micro_structures.dm @@ -20,7 +20,7 @@ var/global/list/micro_tunnels = list() /mob/living/simple_mob/slime ) -/obj/structure/micro_tunnel/Initialize() +/obj/structure/micro_tunnel/Initialize(mapload) . = ..() micro_tunnels.Add(src) if(name == initial(name)) @@ -452,7 +452,7 @@ var/global/list/micro_tunnels = list() var/chance_to_spawn = 25 -/obj/effect/mouse_hole_spawner/Initialize() +/obj/effect/mouse_hole_spawner/Initialize(mapload) . = ..() if(prob(chance_to_spawn)) diff --git a/code/game/objects/random/_random.dm b/code/game/objects/random/_random.dm index f3434db393..1af45de204 100644 --- a/code/game/objects/random/_random.dm +++ b/code/game/objects/random/_random.dm @@ -7,7 +7,7 @@ var/drop_get_turf = TRUE -/obj/random/Initialize() +/obj/random/Initialize(mapload) . = INITIALIZE_HINT_QDEL ..() if (prob(spawn_nothing_percentage)) @@ -112,7 +112,7 @@ var/list/multi_point_spawns var/id // Group id var/weight // Probability weight for this spawn point -/obj/random_multi/Initialize() +/obj/random_multi/Initialize(mapload) . = ..() weight = max(1, round(weight)) @@ -147,4 +147,4 @@ var/list/multi_point_spawns rm.generate_items() for(var/entry in spawn_points) qdel(entry) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 2ae0be5b51..96ff39837a 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -68,7 +68,7 @@ pixel_x = 10 pixel_y = 9 -/obj/item/canvas/Initialize() +/obj/item/canvas/Initialize(mapload) . = ..() reset_grid() desc += " (Canvas size is [width]x[height].)" @@ -271,7 +271,7 @@ var/image/color_drop var/hud_level = FALSE -/obj/item/paint_brush/Initialize() +/obj/item/paint_brush/Initialize(mapload) . = ..() color_drop = image(icon, null, "brush_color") color_drop.color = selected_color diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm index f19c1e4bfb..6fdf137653 100644 --- a/code/game/objects/structures/catwalk.dm +++ b/code/game/objects/structures/catwalk.dm @@ -20,7 +20,7 @@ var/maxhealth = 100 var/delete_me = FALSE -/obj/structure/catwalk/Initialize() +/obj/structure/catwalk/Initialize(mapload) . = ..() if(delete_me) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/structures/cliff.dm b/code/game/objects/structures/cliff.dm index 201aab139b..807ec81eb0 100644 --- a/code/game/objects/structures/cliff.dm +++ b/code/game/objects/structures/cliff.dm @@ -45,7 +45,7 @@ two tiles on initialization, and which way a cliff is facing may change during m var/is_double_cliff = FALSE // Set to true when making the two-tile cliffs, used for projectile checks. var/uphill_penalty = 30 // Odds of a projectile not making it up the cliff. -/obj/structure/cliff/Initialize() +/obj/structure/cliff/Initialize(mapload) . = ..() register_dangerous_to_step() @@ -83,7 +83,7 @@ two tiles on initialization, and which way a cliff is facing may change during m /obj/structure/cliff/bottom bottom = TRUE -/obj/structure/cliff/automatic/Initialize() +/obj/structure/cliff/automatic/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 7ce8aff9ea..3daf04a731 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -42,7 +42,7 @@ var/obj/effect/overlay/closet_door/door_obj var/vore_sound = 'sound/effects/metalscrape2.ogg' -/obj/structure/closet/Initialize() +/obj/structure/closet/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 560f4e2721..6f7c928cf9 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -30,7 +30,7 @@ /obj/item/ammo_magazine/clip/c762/hunter = 9, /obj/item/gun/projectile/shotgun/pump/rifle = 2) -/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize() +/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize(mapload) if(prob(85)) starts_with += /obj/item/gun/projectile/shotgun/pump/rifle else @@ -79,7 +79,7 @@ /obj/item/reagent_containers/food/snacks/liquidprotein, /obj/item/cataloguer) -/obj/structure/closet/secure_closet/explorer/Initialize() +/obj/structure/closet/secure_closet/explorer/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/explorer else @@ -125,7 +125,7 @@ /obj/item/cataloguer/compact/pathfinder, /obj/item/mapping_unit) -/obj/structure/closet/secure_closet/pathfinder/Initialize() +/obj/structure/closet/secure_closet/pathfinder/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/explorer //CHOMPEDIT else @@ -177,7 +177,7 @@ /obj/item/bodybag/cryobag, /obj/item/cataloguer/compact) -/obj/structure/closet/secure_closet/sar/Initialize() +/obj/structure/closet/secure_closet/sar/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/medic else @@ -223,7 +223,7 @@ /obj/item/emergency_beacon ) -/obj/structure/closet/secure_closet/pilot/Initialize() +/obj/structure/closet/secure_closet/pilot/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index b25551e301..014c683212 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -18,7 +18,7 @@ /obj/item/clothing/gloves/fingerless, /obj/item/clothing/head/soft) -/obj/structure/closet/secure_closet/cargotech/Initialize() +/obj/structure/closet/secure_closet/cargotech/Initialize(mapload) if(prob(75)) starts_with += /obj/item/storage/backpack else @@ -60,7 +60,7 @@ /obj/item/clothing/head/beret/qm, /obj/item/clothing/shoes/boots/winter/supply) -/obj/structure/closet/secure_closet/quartermaster/Initialize() +/obj/structure/closet/secure_closet/quartermaster/Initialize(mapload) if(prob(75)) starts_with += /obj/item/storage/backpack else @@ -91,7 +91,7 @@ /obj/item/emergency_beacon, /obj/item/stack/marker_beacon/thirty) -/obj/structure/closet/secure_closet/miner/Initialize() +/obj/structure/closet/secure_closet/miner/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else @@ -120,7 +120,7 @@ /obj/item/clothing/shoes/boots/winter/mining, /obj/item/stack/marker_beacon/thirty) -/obj/structure/closet/lumber/Initialize() +/obj/structure/closet/lumber/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm index 27a049088f..d016b4dfb1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm @@ -1,3 +1,3 @@ -/obj/structure/closet/secure_closet/miner/Initialize() +/obj/structure/closet/secure_closet/miner/Initialize(mapload) starts_with += /obj/item/gps/mining - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index f295603c1a..95d1ccde55 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -42,7 +42,7 @@ /obj/item/rcd/advanced/loaded, //CHOMPAdd /obj/item/pipe_dispenser) //YW Add -/obj/structure/closet/secure_closet/engineering_chief/Initialize() +/obj/structure/closet/secure_closet/engineering_chief/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else @@ -111,7 +111,7 @@ /obj/item/reagent_containers/spray/windowsealant, //VOREStation Add /obj/item/areaeditor/blueprints/engineers) //VOREStation Add -/obj/structure/closet/secure_closet/engineering_personal/Initialize() +/obj/structure/closet/secure_closet/engineering_personal/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else @@ -147,7 +147,7 @@ /obj/item/pipe_dispenser, //CHOMPAdd /obj/item/storage/belt/utility/atmostech) //VOREStation edit. They don't get a toolbox to fill it from, so why not give a spare one that's full already? -/obj/structure/closet/secure_closet/atmos_personal/Initialize() +/obj/structure/closet/secure_closet/atmos_personal/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 6bddafc6b3..819ab5c39f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -5,7 +5,7 @@ req_one_access = list(access_armory) closet_appearance = null -/obj/structure/closet/secure_closet/guncabinet/Initialize() +/obj/structure/closet/secure_closet/guncabinet/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index d20e958d69..064431c56e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -23,7 +23,7 @@ /obj/item/storage/belt/hydro, /obj/item/material/fishing_net/butterfly_net) -/obj/structure/closet/secure_closet/hydroponics/Initialize() +/obj/structure/closet/secure_closet/hydroponics/Initialize(mapload) if(prob(50)) starts_with += /obj/item/clothing/suit/storage/apron else @@ -35,7 +35,7 @@ req_access = list(access_xenobiology) closet_appearance = /decl/closet_appearance/secure_closet/hydroponics/xenoflora -/obj/structure/closet/secure_closet/hydroponics/sci/Initialize() +/obj/structure/closet/secure_closet/hydroponics/sci/Initialize(mapload) starts_with += /obj/item/clothing/head/bio_hood/scientist starts_with += /obj/item/clothing/suit/bio_suit/scientist starts_with += /obj/item/clothing/mask/gas/clear // VOREStation Edit: Gasmasks we use are different //Chompedit: not anymore! diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index bc061a2618..19b86fe3af 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -48,7 +48,7 @@ /obj/item/storage/box/freezer = 3, /obj/item/storage/belt/medical) //VOREStation Add -/obj/structure/closet/secure_closet/medical3/Initialize() +/obj/structure/closet/secure_closet/medical3/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/medic else @@ -163,7 +163,7 @@ /obj/item/reagent_containers/glass/beaker/vial, //VOREStation Add /obj/item/storage/belt/medical) //VOREStation Add -/obj/structure/closet/secure_closet/CMO/Initialize() +/obj/structure/closet/secure_closet/CMO/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/medic else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm index 7cb01d23d5..aa49495b9a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm @@ -1,3 +1,3 @@ -/obj/structure/closet/secure_closet/paramedic/Initialize() +/obj/structure/closet/secure_closet/paramedic/Initialize(mapload) starts_with += /obj/item/gps/medical - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index c1753b2df9..71cf1ffa05 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -9,7 +9,7 @@ /obj/item/radio/headset) */ -/obj/structure/closet/secure_closet/personal/Initialize() +/obj/structure/closet/secure_closet/personal/Initialize(mapload) /* //VOREStation Removal if(prob(50)) starts_with += /obj/item/storage/backpack diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 34bab3dcd7..90d63d008d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -13,7 +13,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/shoes/boots/winter/science) -/obj/structure/closet/secure_closet/scientist/Initialize() +/obj/structure/closet/secure_closet/scientist/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/dufflebag/sci else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 035b94e29d..599ef8a00c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -121,7 +121,7 @@ /obj/item/clothing/accessory/bodycam) // CHOMPEdit -/obj/structure/closet/secure_closet/hos/Initialize() +/obj/structure/closet/secure_closet/hos/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else @@ -185,7 +185,7 @@ ) -/obj/structure/closet/secure_closet/warden/Initialize() +/obj/structure/closet/secure_closet/warden/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else @@ -233,7 +233,7 @@ /obj/item/ticket_printer, //CHOMPStation addition ) -/obj/structure/closet/secure_closet/security/Initialize() +/obj/structure/closet/secure_closet/security/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else @@ -244,22 +244,22 @@ starts_with += /obj/item/poster/nanotrasen return ..() -/obj/structure/closet/secure_closet/security/cargo/Initialize() +/obj/structure/closet/secure_closet/security/cargo/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/cargo starts_with += /obj/item/encryptionkey/headset_cargo return ..() -/obj/structure/closet/secure_closet/security/engine/Initialize() +/obj/structure/closet/secure_closet/security/engine/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/engine starts_with += /obj/item/encryptionkey/headset_eng return ..() -/obj/structure/closet/secure_closet/security/science/Initialize() +/obj/structure/closet/secure_closet/security/science/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/science starts_with += /obj/item/encryptionkey/headset_sci return ..() -/obj/structure/closet/secure_closet/security/med/Initialize() +/obj/structure/closet/secure_closet/security/med/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/medblue starts_with += /obj/item/encryptionkey/headset_med return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index 2ab0a7ad20..96c4d4abe7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -109,7 +109,7 @@ /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless) -/obj/structure/closet/secure_closet/nanotrasen_security/Initialize() +/obj/structure/closet/secure_closet/nanotrasen_security/Initialize(mapload) if(prob(25)) starts_with += /obj/item/storage/backpack/security else @@ -159,7 +159,7 @@ /obj/item/clothing/shoes/boots/jackboots/toeless, /obj/item/clothing/under/nanotrasen/security/commander) -/obj/structure/closet/secure_closet/nanotrasen_commander/Initialize() +/obj/structure/closet/secure_closet/nanotrasen_commander/Initialize(mapload) if(prob(25)) starts_with += /obj/item/storage/backpack/security else @@ -201,7 +201,7 @@ /obj/item/clothing/shoes/boots/jackboots, /obj/item/clothing/shoes/boots/jackboots/toeless) -/obj/structure/closet/secure_closet/nanotrasen_warden/Initialize() +/obj/structure/closet/secure_closet/nanotrasen_warden/Initialize(mapload) if(prob(25)) new /obj/item/storage/backpack/security(src) else diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 1dc3e31480..afdbbed16d 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -46,7 +46,7 @@ /obj/structure/closet/syndicate/resources desc = "An old, dusty locker." -/obj/structure/closet/syndicate/resources/Initialize() +/obj/structure/closet/syndicate/resources/Initialize(mapload) . = ..() if(!contents.len) var/common_min = 30 //Minimum amount of minerals in the stack for common minerals @@ -101,7 +101,7 @@ /obj/structure/closet/syndicate/resources/everything desc = "It's an emergency storage closet for repairs." -/obj/structure/closet/syndicate/resources/everything/Initialize() +/obj/structure/closet/syndicate/resources/everything/Initialize(mapload) var/list/resources = list( /obj/item/stack/material/steel, /obj/item/stack/material/glass, diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 4966760c67..a913bfedd5 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -17,7 +17,7 @@ desc = "It's a storage unit for emergency breathmasks and O2 tanks." closet_appearance = /decl/closet_appearance/oxygen -/obj/structure/closet/emcloset/Initialize() +/obj/structure/closet/emcloset/Initialize(mapload) switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10))) //CHOMPEdit Block Start - Modified List if ("small") @@ -116,7 +116,7 @@ desc = "It's a storage unit for tools." closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools -/obj/structure/closet/toolcloset/Initialize() +/obj/structure/closet/toolcloset/Initialize(mapload) starts_with = list() if(prob(40)) starts_with += /obj/item/clothing/suit/storage/hazardvest diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm index e8634fe4a3..152b6fb816 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets_vr.dm @@ -1,4 +1,4 @@ -/obj/structure/closet/firecloset/Initialize() +/obj/structure/closet/firecloset/Initialize(mapload) starts_with += /obj/item/storage/toolbox/emergency return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index d70d76b97d..876c401913 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -21,7 +21,7 @@ /obj/item/clothing/accessory/armband = 3, /obj/item/clothing/accessory/holster/waist = 3) -/obj/structure/closet/wardrobe/red/Initialize() +/obj/structure/closet/wardrobe/red/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else @@ -231,7 +231,7 @@ /obj/item/storage/backpack/toxins, /obj/item/storage/backpack/satchel/tox) -/obj/structure/closet/wardrobe/science_white/Initialize() +/obj/structure/closet/wardrobe/science_white/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/dufflebag/sci else @@ -257,7 +257,7 @@ /obj/item/storage/backpack/toxins, /obj/item/storage/backpack/satchel/tox) -/obj/structure/closet/wardrobe/robotics_black/Initialize() +/obj/structure/closet/wardrobe/robotics_black/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/dufflebag/sci else @@ -406,7 +406,7 @@ /obj/item/clothing/gloves/black, /obj/item/clothing/under/pants/camo) -/obj/structure/closet/wardrobe/tactical/Initialize() +/obj/structure/closet/wardrobe/tactical/Initialize(mapload) if(prob(25)) starts_with += /obj/item/storage/belt/security/tactical/bandolier else diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 5557a27cf7..e27a0d10d8 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -6,7 +6,7 @@ density = TRUE var/list/starts_with -/obj/structure/largecrate/Initialize() +/obj/structure/largecrate/Initialize(mapload) . = ..() if(starts_with) create_objects_in_loc(src, starts_with) @@ -75,7 +75,7 @@ desc = "Wulf Aeronautics says it comes in a box for the consumer's sake... How is this so light?" icon_state = "vehiclecrate" -/obj/structure/largecrate/vehicle/Initialize() +/obj/structure/largecrate/vehicle/Initialize(mapload) . = ..() for(var/obj/O in contents) O.update_icon() diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 360cdd8156..0de2a0f4be 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -40,7 +40,7 @@ name = "Predator carrier" starts_with = list(/mob/living/simple_mob/vore/catgirl) -/obj/structure/largecrate/animal/pred/Initialize() //This is nessesary to get a random one each time. +/obj/structure/largecrate/animal/pred/Initialize(mapload) //This is nessesary to get a random one each time. starts_with = list(pick(/mob/living/simple_mob/vore/bee, /mob/living/simple_mob/vore/catgirl;3, /mob/living/simple_mob/vore/aggressive/frog, @@ -65,7 +65,7 @@ name = "Dangerous Predator carrier" starts_with = list(/mob/living/simple_mob/animal/space/alien) -/obj/structure/largecrate/animal/dangerous/Initialize() +/obj/structure/largecrate/animal/dangerous/Initialize(mapload) starts_with = list(pick(/mob/living/simple_mob/animal/space/carp/large, /mob/living/simple_mob/vore/aggressive/deathclaw, /mob/living/simple_mob/vore/aggressive/dino, @@ -86,7 +86,7 @@ icon_state = "sotiecrate" starts_with = list(/mob/living/simple_mob/vore/otie/security) -/obj/structure/largecrate/animal/otie/guardbeast/Initialize() +/obj/structure/largecrate/animal/otie/guardbeast/Initialize(mapload) starts_with = list(pick(/mob/living/simple_mob/vore/otie/security, /mob/living/simple_mob/vore/otie/security/chubby)) return ..() @@ -98,7 +98,7 @@ icon_state = "sotiecrate" starts_with = list(/mob/living/simple_mob/vore/otie/security/phoron) -/obj/structure/largecrate/animal/otie/guardmutant/Initialize() +/obj/structure/largecrate/animal/otie/guardmutant/Initialize(mapload) starts_with = list(pick(/mob/living/simple_mob/vore/otie/security/phoron;2, /mob/living/simple_mob/vore/otie/security/phoron/red;0.5, /mob/living/simple_mob/vore/otie/security/phoron/red/chubby;0.5)) @@ -112,7 +112,7 @@ starts_with = list(/mob/living/simple_mob/vore/otie/cotie) var/taped = 1 -/obj/structure/largecrate/animal/otie/Initialize() +/obj/structure/largecrate/animal/otie/Initialize(mapload) starts_with = list(pick(/mob/living/simple_mob/vore/otie/cotie, /mob/living/simple_mob/vore/otie/cotie/chubby)) return ..() @@ -122,7 +122,7 @@ desc = "VARMAcorp experimental hostile environment adaptive breeding development kit. WARNING, DO NOT RELEASE IN WILD!" starts_with = list(/mob/living/simple_mob/vore/otie/cotie/phoron) -/obj/structure/largecrate/animal/otie/phoron/Initialize() +/obj/structure/largecrate/animal/otie/phoron/Initialize(mapload) starts_with = list(pick(/mob/living/simple_mob/vore/otie/cotie/phoron;2, /mob/living/simple_mob/vore/otie/red/friendly;0.5, /mob/living/simple_mob/vore/otie/red/chubby;0.5)) //ChompEDIT add @@ -150,7 +150,7 @@ desc = "Bounces around a lot. Looks messily packaged, were they in a hurry?" starts_with = list(/mob/living/simple_mob/vore/fennec) -/obj/structure/largecrate/animal/fennec/Initialize() +/obj/structure/largecrate/animal/fennec/Initialize(mapload) starts_with = list(pick(/mob/living/simple_mob/vore/fennec, /mob/living/simple_mob/vore/fennix;0.5)) return ..() diff --git a/code/game/objects/structures/crates_lockers/largecrate_yw.dm b/code/game/objects/structures/crates_lockers/largecrate_yw.dm index 3a2336a01a..cf1e79638b 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_yw.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_yw.dm @@ -3,6 +3,6 @@ starts_with = list(/obj/structure/musician/piano) desc = "*Grand piano may end up being a minimoog." -/obj/structure/largecrate/piano/Initialize() //This is nessesary to get a random one each time. +/obj/structure/largecrate/piano/Initialize(mapload) //This is nessesary to get a random one each time. starts_with = list(/obj/structure/musician/piano) return ..() diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm index 7ea9a27ab4..cef723e0c6 100644 --- a/code/game/objects/structures/crates_lockers/vehiclecage.dm +++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm @@ -13,7 +13,7 @@ if(my_vehicle) . += span_notice("It seems to contain \the [my_vehicle].") -/obj/structure/vehiclecage/Initialize() +/obj/structure/vehiclecage/Initialize(mapload) . = ..() if(my_vehicle_type) my_vehicle = new my_vehicle_type(src) diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index a4b584e829..23c6379087 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -6,7 +6,7 @@ var/obj/item/assembly/shock_kit/part = null var/last_time = 1.0 -/obj/structure/bed/chair/e_chair/Initialize() +/obj/structure/bed/chair/e_chair/Initialize(mapload) . = ..() add_overlay(image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)) return diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index ca764fa85c..5a20120040 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() return ..() @@ -129,7 +129,7 @@ var/lock_difficulty = 1 //multiplier to picking/bypassing time var/keysound = 'sound/items/toolbelt_equip.ogg' -/obj/structure/fence/door/Initialize() +/obj/structure/fence/door/Initialize(mapload) update_door_status() return ..() diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 8281a7f9ca..fefc8acfc0 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -14,7 +14,7 @@ var/smashed = 0 var/starts_with_axe = TRUE -/obj/structure/fireaxecabinet/Initialize() +/obj/structure/fireaxecabinet/Initialize(mapload) . = ..() if(starts_with_axe) fireaxe = new /obj/item/material/twohanded/fireaxe() diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index 2a8337e435..93635090f3 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -23,7 +23,7 @@ var/min_harvests = -1 var/list/harvest_loot = null // Should be an associative list for things to spawn, and their weights. An example would be a branch from a tree. -/obj/structure/flora/Initialize() +/obj/structure/flora/Initialize(mapload) . = ..() if(randomize_size) @@ -472,7 +472,7 @@ max_harvests = 2 min_harvests = 0 -/obj/structure/flora/mushroom/Initialize() +/obj/structure/flora/mushroom/Initialize(mapload) . = ..() icon_state = "mush[rand(1,4)]" if(prob(50)) @@ -545,7 +545,7 @@ max_harvests = 2 min_harvests = 0 -/obj/structure/flora/sif/subterranean/Initialize() +/obj/structure/flora/sif/subterranean/Initialize(mapload) icon_state = "[initial(icon_state)][rand(1,2)]" . = ..() @@ -566,7 +566,7 @@ min_harvests = 0 harvest_loot = list(/obj/item/reagent_containers/food/snacks/grown/sif/eyebulbs = 1) -/obj/structure/flora/sif/eyes/Initialize() +/obj/structure/flora/sif/eyes/Initialize(mapload) icon_state = "[initial(icon_state)][rand(1,3)]" . = ..() @@ -593,7 +593,7 @@ /obj/item/reagent_containers/food/snacks/grown/sif/wildwabback = 30 ) -/obj/structure/flora/sif/tendrils/Initialize() +/obj/structure/flora/sif/tendrils/Initialize(mapload) icon_state = "[initial(icon_state)][rand(1,3)]" . = ..() @@ -625,7 +625,7 @@ var/variantnum = null -/obj/structure/flora/sif/frostbelle/Initialize() +/obj/structure/flora/sif/frostbelle/Initialize(mapload) . = ..() variantnum = rand(1,3) update_icon() diff --git a/code/game/objects/structures/flora/moretrees_vr.dm b/code/game/objects/structures/flora/moretrees_vr.dm index 6541fda802..2b2df4e67c 100644 --- a/code/game/objects/structures/flora/moretrees_vr.dm +++ b/code/game/objects/structures/flora/moretrees_vr.dm @@ -14,7 +14,7 @@ /obj/structure/flora/tree/bigtree/choose_icon_state() return "[base_state][rand(1, 4)]" -/obj/structure/flora/tree/bigtree/Initialize() +/obj/structure/flora/tree/bigtree/Initialize(mapload) . = ..() var/image/i = image('icons/obj/flora/moretrees_vr.dmi', "[icon_state]-b") @@ -29,4 +29,4 @@ density = FALSE icon_state = "[icon_state]_stump" cut_overlays() - set_light(0) \ No newline at end of file + set_light(0) diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index 0218ca5d16..c516e9a9ee 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -15,7 +15,7 @@ var/is_stump = FALSE // If true, suspends damage tracking and most other effects. var/indestructable = FALSE // If true, the tree cannot die. -/obj/structure/flora/tree/Initialize() +/obj/structure/flora/tree/Initialize(mapload) icon_state = choose_icon_state() return ..() @@ -331,7 +331,7 @@ light_shift = rand(0, 5) return "[base_state][light_shift]" -/obj/structure/flora/tree/sif/Initialize() +/obj/structure/flora/tree/sif/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 72f4ec70b2..41e4ed21c1 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -187,7 +187,7 @@ icon_state = "redgate_hole" icon_state_opened = "redgate_hole" -/obj/structure/ghost_pod/ghost_activated/maintpred/redgate/Initialize() +/obj/structure/ghost_pod/ghost_activated/maintpred/redgate/Initialize(mapload) . = ..() if(!(src in active_ghost_pods)) active_ghost_pods += src @@ -266,7 +266,7 @@ new_character.visible_message(span_warning("[new_character] appears to crawl out of somewhere.")) qdel(src) -/obj/structure/ghost_pod/ghost_activated/maint_lurker/Initialize() +/obj/structure/ghost_pod/ghost_activated/maint_lurker/Initialize(mapload) . = ..() if(!(src in active_ghost_pods)) active_ghost_pods += src diff --git a/code/game/objects/structures/ghost_pods/ghost_pods.dm b/code/game/objects/structures/ghost_pods/ghost_pods.dm index 6c10f000d3..ca991da95e 100644 --- a/code/game/objects/structures/ghost_pods/ghost_pods.dm +++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm @@ -71,7 +71,7 @@ var/delay_to_self_open = 10 MINUTES // How long to wait for first attempt. Note that the timer by default starts when the pod is created. var/delay_to_try_again = 20 MINUTES // How long to wait if first attempt fails. Set to 0 to never try again. -/obj/structure/ghost_pod/automatic/Initialize() +/obj/structure/ghost_pod/automatic/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(trigger)), delay_to_self_open) diff --git a/code/game/objects/structures/ghost_pods/human.dm b/code/game/objects/structures/ghost_pods/human.dm index 8a429a77fe..8ebe9e4207 100644 --- a/code/game/objects/structures/ghost_pods/human.dm +++ b/code/game/objects/structures/ghost_pods/human.dm @@ -24,7 +24,7 @@ var/list/clothing_possibilities -/obj/structure/ghost_pod/ghost_activated/human/Initialize() +/obj/structure/ghost_pod/ghost_activated/human/Initialize(mapload) . = ..() handle_clothing_setup() @@ -152,7 +152,7 @@ var/list/clothing_possibilities -/obj/structure/ghost_pod/manual/human/Initialize() +/obj/structure/ghost_pod/manual/human/Initialize(mapload) . = ..() handle_clothing_setup() diff --git a/code/game/objects/structures/ghost_pods/silicon.dm b/code/game/objects/structures/ghost_pods/silicon.dm index 4f50784aed..8c29869134 100644 --- a/code/game/objects/structures/ghost_pods/silicon.dm +++ b/code/game/objects/structures/ghost_pods/silicon.dm @@ -86,7 +86,7 @@ if(!QDELETED(src)) qdel(src) -/obj/structure/ghost_pod/ghost_activated/swarm_drone/event/Initialize() +/obj/structure/ghost_pod/ghost_activated/swarm_drone/event/Initialize(mapload) . = ..() var/turf/T = get_turf(src) diff --git a/code/game/objects/structures/ghost_pods/survivor.dm b/code/game/objects/structures/ghost_pods/survivor.dm index a97a201305..afe758ce44 100644 --- a/code/game/objects/structures/ghost_pods/survivor.dm +++ b/code/game/objects/structures/ghost_pods/survivor.dm @@ -36,7 +36,7 @@ var/suffer_cloneloss = FALSE var/clone_severity = 5 -/obj/structure/ghost_pod/manual/survivor/Initialize() +/obj/structure/ghost_pod/manual/survivor/Initialize(mapload) . = ..() handle_clothing_setup() diff --git a/code/game/objects/structures/holoplant.dm b/code/game/objects/structures/holoplant.dm index 57f14bbc60..66c120135b 100644 --- a/code/game/objects/structures/holoplant.dm +++ b/code/game/objects/structures/holoplant.dm @@ -17,7 +17,7 @@ "plant-13" ) -/obj/machinery/holoplant/Initialize() +/obj/machinery/holoplant/Initialize(mapload) . = ..() activate() @@ -102,5 +102,5 @@ /obj/machinery/holoplant/shipped anchored = FALSE -/obj/machinery/holoplant/shipped/Initialize() +/obj/machinery/holoplant/shipped/Initialize(mapload) . = ..() diff --git a/code/game/objects/structures/kitchen_foodcart_vr.dm b/code/game/objects/structures/kitchen_foodcart_vr.dm index c15168e9f6..ae94c6f58b 100644 --- a/code/game/objects/structures/kitchen_foodcart_vr.dm +++ b/code/game/objects/structures/kitchen_foodcart_vr.dm @@ -7,7 +7,7 @@ opacity = 0 density = TRUE -/obj/structure/foodcart/Initialize() +/obj/structure/foodcart/Initialize(mapload) . = ..() for(var/obj/item/I in loc) if(istype(I, /obj/item/reagent_containers/food)) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 8b3aebafe1..01866cf67c 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -8,7 +8,7 @@ w_class = ITEMSIZE_NORMAL plane = PLATING_PLANE -/obj/structure/lattice/Initialize() +/obj/structure/lattice/Initialize(mapload) . = ..() if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/open) || istype(src.loc, /turf/simulated/mineral) || istype(src.loc, /turf/simulated/shuttle/plating/airless/carry))) diff --git a/code/game/objects/structures/lightpost.dm b/code/game/objects/structures/lightpost.dm index b915147c17..4db2dbaaf0 100644 --- a/code/game/objects/structures/lightpost.dm +++ b/code/game/objects/structures/lightpost.dm @@ -12,7 +12,7 @@ var/lit = TRUE // If true, will have a glowing overlay and lighting. var/festive = FALSE // If true, adds a festive bow overlay to it. -/obj/structure/lightpost/Initialize() +/obj/structure/lightpost/Initialize(mapload) update_icon() return ..() @@ -39,4 +39,4 @@ festive = TRUE /obj/structure/lightpost/festive/unlit - lit = FALSE \ No newline at end of file + lit = FALSE diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index cbab5632ef..a1be2bbea1 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -136,7 +136,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh var/path = pick(rare_loot) return new path(src) -/obj/structure/loot_pile/Initialize() +/obj/structure/loot_pile/Initialize(mapload) if(icon_states_to_use && icon_states_to_use.len) icon_state = pick(icon_states_to_use) . = ..() diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index cee261f739..52e7330e1b 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -346,7 +346,7 @@ noblend_objects = list(/obj/machinery/door/window) color = "#666666" -/obj/structure/grille/bay/Initialize() +/obj/structure/grille/bay/Initialize(mapload) . = ..() return INITIALIZE_HINT_LATELOAD @@ -404,7 +404,7 @@ maxhealth = 24 glasstype = /obj/item/stack/material/glass -/obj/structure/window/bay/Initialize() +/obj/structure/window/bay/Initialize(mapload) . = ..() var/obj/item/stack/material/glass/G = glasstype var/datum/material/M = get_material_by_name(initial(G.default_type)) @@ -498,7 +498,7 @@ maxhealth = 24 alpha = 150 -/obj/structure/window/eris/Initialize() +/obj/structure/window/eris/Initialize(mapload) . = ..() return INITIALIZE_HINT_LATELOAD @@ -576,7 +576,7 @@ icon = null -/obj/effect/low_wall_spawner/Initialize() +/obj/effect/low_wall_spawner/Initialize(mapload) . = ..() if(locate(/obj/effect/low_wall_spawner) in oview(0, src)) warning("Duplicate low wall spawners in [x],[y],[z]!") diff --git a/code/game/objects/structures/map_blocker_vr.dm b/code/game/objects/structures/map_blocker_vr.dm index 2b41679979..307361d632 100644 --- a/code/game/objects/structures/map_blocker_vr.dm +++ b/code/game/objects/structures/map_blocker_vr.dm @@ -11,7 +11,7 @@ plane = PLANE_BUILDMODE /* //VOREStation Edit -/obj/effect/blocker/Initialize() // For non-gateway maps. +/obj/effect/blocker/Initialize(mapload) // For non-gateway maps. . = ..() icon = null icon_state = null diff --git a/code/game/objects/structures/pillows.dm b/code/game/objects/structures/pillows.dm index d876f723eb..78a3c6bb4c 100644 --- a/code/game/objects/structures/pillows.dm +++ b/code/game/objects/structures/pillows.dm @@ -51,7 +51,7 @@ plane = MOB_PLANE var/sourcepillow = "/obj/item/bedsheet/pillow" -/obj/structure/bed/pillowpile/Initialize() +/obj/structure/bed/pillowpile/Initialize(mapload) . = ..() var/turf/T = get_turf(src) new pillowpilefront(T) diff --git a/code/game/objects/structures/props/alien_props.dm b/code/game/objects/structures/props/alien_props.dm index e4edf9b219..ec99c635b8 100644 --- a/code/game/objects/structures/props/alien_props.dm +++ b/code/game/objects/structures/props/alien_props.dm @@ -106,7 +106,7 @@ var/static/list/possible_states = list("health", "spider", "slime", "emp", "species", "egg", "vent", "mindshock", "viral", "gland") var/static/list/possible_tech = list(TECH_MATERIAL, TECH_ENGINEERING, TECH_PHORON, TECH_POWER, TECH_BIO, TECH_COMBAT, TECH_MAGNET, TECH_DATA) -/obj/item/prop/alien/junk/Initialize() +/obj/item/prop/alien/junk/Initialize(mapload) . = ..() icon_state = pick(possible_states) var/list/techs = possible_tech.Copy() diff --git a/code/game/objects/structures/props/altevian.dm b/code/game/objects/structures/props/altevian.dm index d3c3616a48..843a9d30c5 100644 --- a/code/game/objects/structures/props/altevian.dm +++ b/code/game/objects/structures/props/altevian.dm @@ -17,7 +17,7 @@ bound_height = 128 var/has_misc_overlay = TRUE -/obj/structure/prop/altevian_jump_drive/Initialize() +/obj/structure/prop/altevian_jump_drive/Initialize(mapload) .=..() update_icon() diff --git a/code/game/objects/structures/props/beam_prism.dm b/code/game/objects/structures/props/beam_prism.dm index 72df25f2ea..c87a58bc0c 100644 --- a/code/game/objects/structures/props/beam_prism.dm +++ b/code/game/objects/structures/props/beam_prism.dm @@ -26,7 +26,7 @@ interaction_message = span_notice("The prismatic turret seems to be able to rotate.") -/obj/structure/prop/prism/Initialize() +/obj/structure/prop/prism/Initialize(mapload) . = ..() if(degrees_from_north) animate(src, transform = turn(NORTH, degrees_from_north), time = 3) @@ -197,7 +197,7 @@ for(var/obj/structure/prop/prism/P in my_turrets) P.rotate_auto(new_bearing) -/obj/structure/prop/prismcontrol/Initialize() +/obj/structure/prop/prismcontrol/Initialize(mapload) . = ..() if(my_turrets.len) //Preset controls. for(var/obj/structure/prop/prism/P in my_turrets) diff --git a/code/game/objects/structures/props/machines.dm b/code/game/objects/structures/props/machines.dm index 548bc27587..2ece08ea99 100644 --- a/code/game/objects/structures/props/machines.dm +++ b/code/game/objects/structures/props/machines.dm @@ -251,7 +251,7 @@ /obj/structure/prop/machine/stamper/starts_on icon_state = "stamper_on" -/obj/structure/prop/machine/stamper/starts_on/Initialize() +/obj/structure/prop/machine/stamper/starts_on/Initialize(mapload) . = ..() add_overlay("stamper_proc") add_overlay("stamper_but") diff --git a/code/game/objects/structures/props/nest.dm b/code/game/objects/structures/props/nest.dm index 9f4a219883..a6541732a4 100644 --- a/code/game/objects/structures/props/nest.dm +++ b/code/game/objects/structures/props/nest.dm @@ -19,7 +19,7 @@ var/tally = 0 //The counter referenced against total_creature_max, or just to see how many mobs it has spawned. var/total_creature_max //If set, it can spawn this many creatures, total, ever. -/obj/structure/prop/nest/Initialize() +/obj/structure/prop/nest/Initialize(mapload) . = ..() den_mobs = list() START_PROCESSING(SSobj, src) diff --git a/code/game/objects/structures/props/puzzledoor.dm b/code/game/objects/structures/props/puzzledoor.dm index 6ccad1e21d..9573614cdd 100644 --- a/code/game/objects/structures/props/puzzledoor.dm +++ b/code/game/objects/structures/props/puzzledoor.dm @@ -35,7 +35,7 @@ visible_message(span_cult("\The [src] is completely unaffected by the blast.")) return -/obj/machinery/door/blast/puzzle/Initialize() +/obj/machinery/door/blast/puzzle/Initialize(mapload) . = ..() implicit_material = get_material_by_name("dungeonium") if(locks.len) diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm index 95d3249d7c..4cd812a28f 100644 --- a/code/game/objects/structures/props/swarm.dm +++ b/code/game/objects/structures/props/swarm.dm @@ -22,7 +22,7 @@ return TRUE return ..() -/obj/structure/cult/pylon/swarm/Initialize() +/obj/structure/cult/pylon/swarm/Initialize(mapload) . = ..() active_beams = list() diff --git a/code/game/objects/structures/props/transmitter.dm b/code/game/objects/structures/props/transmitter.dm index f7e13e9a42..789dca00a7 100644 --- a/code/game/objects/structures/props/transmitter.dm +++ b/code/game/objects/structures/props/transmitter.dm @@ -8,7 +8,7 @@ var/datum/looping_sound/sequence/morse/soundloop var/message_to_play = "The quick brown fox jumps over the lazy dog." -/obj/structure/prop/transmitter/Initialize() +/obj/structure/prop/transmitter/Initialize(mapload) soundloop = new(list(src), FALSE) set_new_message(message_to_play) soundloop.start() diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm index 46283b7d2c..761dc3ca6f 100644 --- a/code/game/objects/structures/railing.dm +++ b/code/game/objects/structures/railing.dm @@ -30,7 +30,7 @@ if(climbable) verbs += /obj/structure/proc/climb_on -/obj/structure/railing/Initialize() +/obj/structure/railing/Initialize(mapload) . = ..() if(src.anchored) update_icon(0) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 553f3cbbd5..b7cd4ca178 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -22,7 +22,7 @@ FLOOR SAFES var/maxspace = 24 //the maximum combined w_class of stuff in the safe -/obj/structure/safe/Initialize() +/obj/structure/safe/Initialize(mapload) . = ..() tumbler_1_pos = rand(0, 72) tumbler_1_open = rand(0, 72) @@ -178,7 +178,7 @@ FLOOR SAFES plane = PLATING_PLANE layer = ABOVE_UTILITY -/obj/structure/safe/floor/Initialize() +/obj/structure/safe/floor/Initialize(mapload) . = ..() var/turf/T = loc if(istype(T) && !T.is_plating()) diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm index 3dcd550755..8d22396e7a 100644 --- a/code/game/objects/structures/salvageable.dm +++ b/code/game/objects/structures/salvageable.dm @@ -56,7 +56,7 @@ /obj/item/stock_parts/matter_bin/adv = 20 ) -/obj/structure/salvageable/machine/Initialize() +/obj/structure/salvageable/machine/Initialize(mapload) . = ..() icon_state = "machine[rand(0,6)]" @@ -80,7 +80,7 @@ /obj/item/stock_parts/capacitor/adv = 30, /obj/item/computer_hardware/network_card/advanced = 20 ) -/obj/structure/salvageable/computer/Initialize() +/obj/structure/salvageable/computer/Initialize(mapload) . = ..() icon_state = "computer[rand(0,7)]" @@ -136,7 +136,7 @@ /obj/item/stack/material/silver{amount = 10} = 30 ) -/obj/structure/salvageable/implant_container/Initialize() +/obj/structure/salvageable/implant_container/Initialize(mapload) . = ..() icon_state = "implant_container[rand(0,1)]" @@ -164,7 +164,7 @@ /obj/item/computer_hardware/network_card/advanced = 20 ) -/obj/structure/salvageable/data/Initialize() +/obj/structure/salvageable/data/Initialize(mapload) . = ..() icon_state = "data[rand(0,1)]" @@ -194,7 +194,7 @@ /obj/item/computer_hardware/network_card/advanced = 20 ) -/obj/structure/salvageable/server/Initialize() +/obj/structure/salvageable/server/Initialize(mapload) . = ..() icon_state = "server[rand(0,1)]" @@ -219,7 +219,7 @@ /obj/item/computer_hardware/hard_drive/advanced = 40 ) -/obj/structure/salvageable/personal/Initialize() +/obj/structure/salvageable/personal/Initialize(mapload) . = ..() icon_state = "personal[rand(0,12)]" new /obj/structure/table/reinforced (loc) @@ -234,7 +234,7 @@ /obj/item/computer_hardware/hard_drive/cluster = 50 ) -/obj/structure/salvageable/bliss/Initialize() +/obj/structure/salvageable/bliss/Initialize(mapload) . = ..() icon_state = "bliss[rand(0,1)]" @@ -260,7 +260,7 @@ /obj/item/stock_parts/scanning_module = 40 ) -/obj/structure/salvageable/personal/Initialize() +/obj/structure/salvageable/personal/Initialize(mapload) . = ..() icon_state = "console[rand(0,2)]" diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 54f68dff35..ec397982e3 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -127,7 +127,7 @@ name = "\improper WARNING" icon_state = "securearea" -/obj/structure/sign/warning/Initialize() +/obj/structure/sign/warning/Initialize(mapload) . = ..() desc = "A warning sign which reads '[name]'." @@ -184,7 +184,7 @@ name = "\improper LETHAL TURRETS" icon_state = "turrets" -/obj/structure/sign/warning/lethal_turrets/Initialize() +/obj/structure/sign/warning/lethal_turrets/Initialize(mapload) . = ..() desc += " Enter at own risk!." @@ -358,7 +358,7 @@ //disabled this proc, it serves no purpose except to overwrite the description that already exists. may have been intended for making your own signs? //seems to defeat the point of having a generic directional sign that mappers could edit and use in POIs? left it here in case something breaks. /* -/obj/structure/sign/directions/Initialize() +/obj/structure/sign/directions/Initialize(mapload) . = ..() desc = "A direction sign, pointing out the way to \the [src]." */ diff --git a/code/game/objects/structures/stasis_cage.dm b/code/game/objects/structures/stasis_cage.dm index b0c9034014..6b83ec29f7 100644 --- a/code/game/objects/structures/stasis_cage.dm +++ b/code/game/objects/structures/stasis_cage.dm @@ -8,7 +8,7 @@ var/mob/living/simple_mob/contained -/obj/structure/stasis_cage/Initialize() +/obj/structure/stasis_cage/Initialize(mapload) . = ..() var/mob/living/simple_mob/A = locate() in loc diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 529df9bbd8..ca55948ecb 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -309,7 +309,7 @@ icon_state = "rollerbed" var/obj/item/roller/held -/obj/item/roller_holder/Initialize() +/obj/item/roller_holder/Initialize(mapload) . = ..() held = new /obj/item/roller(src) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm index 51a648eed0..5628d72149 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm @@ -24,14 +24,14 @@ icon_state = "sofacornerOLD" base_icon = "sofacornerOLD" -/obj/structure/bed/chair/sofa/sif_ora/Initialize(var/newloc,var/newmaterial) - ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) +/obj/structure/bed/chair/sofa/sif_ora/Initialize(mapload,var/newmaterial) + . = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE) -/obj/structure/bed/chair/sofa/left/sif_ora/Initialize(var/newloc,var/newmaterial) - ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) +/obj/structure/bed/chair/sofa/left/sif_ora/Initialize(mapload,var/newmaterial) + . = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE) -/obj/structure/bed/chair/sofa/right/sif_ora/Initialize(var/newloc,var/newmaterial) - ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) +/obj/structure/bed/chair/sofa/right/sif_ora/Initialize(mapload,var/newmaterial) + . = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE) -/obj/structure/bed/chair/sofa/corner/sif_ora/Initialize(var/newloc,var/newmaterial) - ..(newloc,MAT_SIFWOOD,MAT_CARPET_ORANGE) \ No newline at end of file +/obj/structure/bed/chair/sofa/corner/sif_ora/Initialize(mapload,var/newmaterial) + . = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 7e63f890b2..7826fd09a2 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -19,7 +19,7 @@ oxygentanks = 0 -/obj/structure/dispenser/Initialize() +/obj/structure/dispenser/Initialize(mapload) . = ..() for(var/i in 1 to oxygentanks) new /obj/item/tank/oxygen(src) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 5f9531c8c2..2795656bd6 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -30,7 +30,7 @@ var/global/list/allocated_gamma = list() -/obj/structure/trash_pile/Initialize() +/obj/structure/trash_pile/Initialize(mapload) . = ..() icon_state = pick( "pile1", diff --git a/code/game/objects/structures/trash_pile_vr_ch.dm b/code/game/objects/structures/trash_pile_vr_ch.dm index b92b484fbc..7f34244043 100644 --- a/code/game/objects/structures/trash_pile_vr_ch.dm +++ b/code/game/objects/structures/trash_pile_vr_ch.dm @@ -24,14 +24,14 @@ /obj/item/storage/pill_bottle/zoom = 2, /obj/item/storage/pill_bottle/paracetamol = 1, ) //override pick list gamma - - var/gammaunique = 1 - -/obj/structure/trash_pile/sharkpile/Initialize() - ..() + var/gammaunique = 1 + + +/obj/structure/trash_pile/sharkpile/Initialize(mapload) + . = ..() if(prob(destroychance)) - qdel(src) + return INITIALIZE_HINT_QDEL //^X% chance to use our own list, otherwise default pool. //Here we could also add a % chance to spawn a mob for trash pandas or such, diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 2f662ef7bb..2bbcb9bae2 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -164,7 +164,7 @@ var/list/temperature_settings = list("normal" = 310, "boiling" = T0C+100, "freezing" = T0C) var/datum/looping_sound/showering/soundloop -/obj/machinery/shower/Initialize() +/obj/machinery/shower/Initialize(mapload) create_reagents(50) soundloop = new(list(src), FALSE) return ..() diff --git a/code/game/objects/structures/watercloset_vr.dm b/code/game/objects/structures/watercloset_vr.dm index bc2be95397..6b626d1af2 100644 --- a/code/game/objects/structures/watercloset_vr.dm +++ b/code/game/objects/structures/watercloset_vr.dm @@ -8,7 +8,7 @@ var/refill_cooldown = 200 var/refilling = FALSE //CHOMPAdd -/obj/structure/toilet/Initialize() +/obj/structure/toilet/Initialize(mapload) if(z in global.using_map.map_levels) teleplumbed = TRUE exit_landmark = locate(/obj/effect/landmark/teleplumb_exit) @@ -83,7 +83,7 @@ var/muffin_mode = FALSE var/mob/living/simple_mob/vore/aggressive/corrupthound/muffinmonster -/obj/structure/biowaste_tank/Initialize() +/obj/structure/biowaste_tank/Initialize(mapload) muffinmonster = new /mob/living/simple_mob/vore/aggressive/corrupthound/muffinmonster(src) muffinmonster.name = "Activate Muffin Monster" muffinmonster.voremob_loaded = TRUE diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index 8841cbf30b..cf2d32ed9f 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -27,7 +27,7 @@ /obj/effect/wingrille_spawn/CanPass(atom/movable/mover, turf/target) return FALSE -/obj/effect/wingrille_spawn/Initialize() +/obj/effect/wingrille_spawn/Initialize(mapload) if(win_path && ticker && ticker.current_state < GAME_STATE_FINISHED) // CHOMPedit: let's make these work after round start activate() ..() diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm index 4903aed6c7..0ea45ce29b 100644 --- a/code/game/shuttle_engines.dm +++ b/code/game/shuttle_engines.dm @@ -20,7 +20,7 @@ return TRUE return ..() -/obj/structure/shuttle/window/Initialize() +/obj/structure/shuttle/window/Initialize(mapload) . = ..() auto_join() diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index f82639e781..5f48a2e591 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -16,10 +16,10 @@ var/list/floor_decals = list() color = newcolour ..(newloc) -// TODO: identify what is causing these atoms to be qdeleted in New()/Initialize() +// TODO: identify what is causing these atoms to be qdeleted in New()/Initialize(mapload) // somewhere in this chain. Alternatively repath to /obj/floor_decal or some other // abstract handler that explicitly doesn't invoke any obj behavior. -/obj/effect/floor_decal/Initialize() +/obj/effect/floor_decal/Initialize(mapload) add_to_turf_decals() flags |= ATOM_INITIALIZED return INITIALIZE_HINT_QDEL @@ -52,7 +52,7 @@ var/list/floor_decals = list() /obj/effect/floor_decal/reset name = "reset marker" -/obj/effect/floor_decal/reset/Initialize() +/obj/effect/floor_decal/reset/Initialize(mapload) ..() var/turf/T = get_turf(src) if(T.decals && T.decals.len) diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 7b7b257a29..1e27f8e35d 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -336,7 +336,7 @@ oxygen = 0 nitrogen = 0 -/turf/simulated/floor/reinforced/n20/Initialize() +/turf/simulated/floor/reinforced/n20/Initialize(mapload) . = ..() if(!air) make_air() air.adjust_gas(GAS_N2O, ATMOSTANK_NITROUSOXIDE) diff --git a/code/game/turfs/flooring/seasonal.dm b/code/game/turfs/flooring/seasonal.dm index 6f7ab84b46..dc644d352b 100644 --- a/code/game/turfs/flooring/seasonal.dm +++ b/code/game/turfs/flooring/seasonal.dm @@ -38,7 +38,7 @@ GLOBAL_VAR(world_time_day) var/trees = null //CHOMPEdit var/snow_chance = 10 -/turf/simulated/floor/outdoors/grass/seasonal/Initialize() //There are A LOT of chompedits here, I guess. +/turf/simulated/floor/outdoors/grass/seasonal/Initialize(mapload) switch(GLOB.world_time_season) if("spring") @@ -171,14 +171,14 @@ GLOBAL_VAR(world_time_day) /turf/simulated/floor/outdoors/grass/seasonal/dark/lowsnow snow_chance = 1 -/turf/simulated/floor/water/seasonal/Initialize() +/turf/simulated/floor/water/seasonal/Initialize(mapload) . = ..() switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals if("winter") if(prob(99)) ChangeTurf(/turf/simulated/floor/outdoors/ice) -/turf/simulated/floor/water/deep/seasonal/Initialize() +/turf/simulated/floor/water/deep/seasonal/Initialize(mapload) . = ..() switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals if("winter") diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 1995ff0756..1d59358035 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -103,7 +103,7 @@ if (isliving(A)) var/dirtslip = FALSE var/mob/living/M = A - if(M.lying || M.flying || M.is_incorporeal()) + if(M.lying || M.flying || M.is_incorporeal() || !(M.flags & ATOM_INITIALIZED)) // Also ignore newly spawning mobs return ..() if(M.dirties_floor()) diff --git a/code/game/turfs/simulated/dungeon/wall.dm b/code/game/turfs/simulated/dungeon/wall.dm index 2fa65ce1c1..8de7b86217 100644 --- a/code/game/turfs/simulated/dungeon/wall.dm +++ b/code/game/turfs/simulated/dungeon/wall.dm @@ -40,7 +40,7 @@ /turf/simulated/wall/solidrock/Initialize(mapload) . = ..(mapload, "bedrock") -/turf/simulated/wall/solidrock/Initialize() +/turf/simulated/wall/solidrock/Initialize(mapload) . = ..() update_icon(1) diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm index c96423ba7f..51c9af24aa 100644 --- a/code/game/turfs/simulated/fancy_shuttles.dm +++ b/code/game/turfs/simulated/fancy_shuttles.dm @@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) layer = DISPOSAL_LAYER alpha = 90 -/obj/effect/fancy_shuttle_floor_preview/Initialize() +/obj/effect/fancy_shuttle_floor_preview/Initialize(mapload) . = ..() return INITIALIZE_HINT_QDEL @@ -164,7 +164,7 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) var/icon_file var/fancy_shuttle_tag -/obj/effect/floor_decal/fancy_shuttle/Initialize() +/obj/effect/floor_decal/fancy_shuttle/Initialize(mapload) var/obj/effect/fancy_shuttle/F = GLOB.fancy_shuttles[fancy_shuttle_tag] if(!F) warning("Fancy shuttle floor decal at [x],[y],[z] couldn't locate a helper with tag [fancy_shuttle_tag]") diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index dd52c4387a..8eed56c788 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -225,7 +225,7 @@ light_on = TRUE block_tele = TRUE -/turf/simulated/shuttle/floor/alien/Initialize() +/turf/simulated/shuttle/floor/alien/Initialize(mapload) . = ..() icon_state = "alienpod[rand(1, 9)]" update_light() @@ -254,7 +254,7 @@ takes_underlays = 1 blocks_air = 1 //I'd make these unsimulated but it just fucks with so much stuff so many other places. -/turf/simulated/shuttle/plating/carry/Initialize() +/turf/simulated/shuttle/plating/carry/Initialize(mapload) . = ..() icon_state = "carry_ingame" @@ -265,7 +265,7 @@ takes_underlays = 1 blocks_air = 1 -/turf/simulated/shuttle/plating/airless/carry/Initialize() +/turf/simulated/shuttle/plating/airless/carry/Initialize(mapload) . = ..() icon_state = "carry_ingame" diff --git a/code/game/turfs/simulated/floor_types_eris.dm b/code/game/turfs/simulated/floor_types_eris.dm index 9a1d7cb51c..2f83c53a41 100644 --- a/code/game/turfs/simulated/floor_types_eris.dm +++ b/code/game/turfs/simulated/floor_types_eris.dm @@ -764,7 +764,7 @@ icon_state = "bar_light" initial_flooring = /decl/flooring/tiling/eris/steel/bar_light -/turf/simulated/floor/tiled/eris/steel/bar_light/Initialize() +/turf/simulated/floor/tiled/eris/steel/bar_light/Initialize(mapload) . = ..() set_light(3,4,"#00AAFF") diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm index 2618693813..6cac26a6dc 100644 --- a/code/game/turfs/simulated/lava.dm +++ b/code/game/turfs/simulated/lava.dm @@ -23,7 +23,7 @@ outdoors = OUTDOORS_YES // For maximum pedantry. -/turf/simulated/floor/lava/Initialize() +/turf/simulated/floor/lava/Initialize(mapload) if(!is_outdoors()) name = "magma" update_icon() @@ -108,4 +108,4 @@ /turf/simulated/floor/lava/is_safe_to_enter(mob/living/L) if(!is_safe() && !L.hovering) return FALSE - return ..() \ No newline at end of file + return ..() diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 6ce7e63a5f..87ce64c025 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -60,12 +60,12 @@ catalogue_data = list(/datum/category_item/catalogue/flora/sif_grass) catalogue_delay = 2 SECONDS -/turf/simulated/floor/outdoors/grass/sif/Initialize() +/turf/simulated/floor/outdoors/grass/sif/Initialize(mapload) if(tree_chance && prob(tree_chance) && !check_density()) new /obj/structure/flora/tree/sif(src) . = ..() -/turf/simulated/floor/outdoors/grass/Initialize() +/turf/simulated/floor/outdoors/grass/Initialize(mapload) if(grass && grass_chance && prob(grass_chance) && !check_density()) //CHOMPEdit var/grass_type = pickweight(GLOB.grass_grass[grass]) //CHOMPEdit if(grass_type) //ChompEDIT - runtime @@ -100,7 +100,7 @@ /turf/simulated/floor/outdoors/rocks/sif var/animal_chance = 0.3 //Should spawn around... 0-7 per round? Tweak as needed. -/turf/simulated/floor/outdoors/rocks/sif/Initialize() +/turf/simulated/floor/outdoors/rocks/sif/Initialize(mapload) if(animal_chance && prob(animal_chance) && !check_density()) new /mob/living/simple_mob/vore/slug(src) diff --git a/code/game/turfs/simulated/outdoors/sky.dm b/code/game/turfs/simulated/outdoors/sky.dm index 6b94f245c1..897ba95e8b 100644 --- a/code/game/turfs/simulated/outdoors/sky.dm +++ b/code/game/turfs/simulated/outdoors/sky.dm @@ -12,7 +12,7 @@ nitrogen = 0 phoron = 0 -/turf/simulated/sky/Initialize() +/turf/simulated/sky/Initialize(mapload) . = ..() //SSplanets.addTurf(src) VOREStation edit - Handled by parent set_light(2, 2, "#FFFFFF") @@ -44,4 +44,4 @@ dir = EAST /turf/simulated/sky/moving/west - dir = WEST \ No newline at end of file + dir = WEST diff --git a/code/game/turfs/simulated/outdoors/snow_yw.dm b/code/game/turfs/simulated/outdoors/snow_yw.dm index eb3ce80128..6c1893fd25 100644 --- a/code/game/turfs/simulated/outdoors/snow_yw.dm +++ b/code/game/turfs/simulated/outdoors/snow_yw.dm @@ -39,12 +39,12 @@ catalogue_data = list(/datum/category_item/catalogue/flora/sif_grass) catalogue_delay = 2 SECONDS -/turf/simulated/floor/outdoors/grass/sif/Initialize() +/turf/simulated/floor/outdoors/grass/sif/Initialize(mapload) if(tree_chance && prob(tree_chance) && !check_density()) new /obj/structure/flora/tree/sif(src) . = ..() -/turf/simulated/floor/outdoors/grass/Initialize() +/turf/simulated/floor/outdoors/grass/Initialize(mapload) if(prob(50)) icon_state = "[initial(icon_state)]2" //edge_blending_priority++ diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 856f92e5c2..8b61df3cc8 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -195,7 +195,7 @@ light_on = TRUE block_tele = TRUE // Will be used for dungeons so this is needed to stop cheesing with handteles. -/turf/simulated/shuttle/wall/alien/Initialize() +/turf/simulated/shuttle/wall/alien/Initialize(mapload) . = ..() update_light() @@ -209,7 +209,7 @@ icon_state = "alien-nj" join_group = null -/turf/simulated/shuttle/wall/Initialize() +/turf/simulated/shuttle/wall/Initialize(mapload) . = ..() //To allow mappers to rename shuttle walls to like "redfloor interior" or whatever for ease of use. @@ -322,7 +322,7 @@ /turf/simulated/shuttle/wall/voidcraft/green stripe_color = "#00FF00" -/turf/simulated/shuttle/wall/voidcraft/Initialize() +/turf/simulated/shuttle/wall/voidcraft/Initialize(mapload) . = ..() update_icon() @@ -344,7 +344,7 @@ density = TRUE breakable = TRUE -/obj/structure/hull_corner/Initialize() +/obj/structure/hull_corner/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/turfs/simulated/wall_types_vr.dm b/code/game/turfs/simulated/wall_types_vr.dm index 3575407780..cc2ea0fb80 100644 --- a/code/game/turfs/simulated/wall_types_vr.dm +++ b/code/game/turfs/simulated/wall_types_vr.dm @@ -86,7 +86,7 @@ var/list/flesh_overlay_cache = list() hard_corner = 1 //They're all HC true_name = "wall" -/turf/simulated/shuttle/wall/flock/Initialize() +/turf/simulated/shuttle/wall/flock/Initialize(mapload) . = ..() set_light(3,3,"#26c5a9") diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index c850ef778c..58ea103c7b 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -22,7 +22,7 @@ var/reagent_type = REAGENT_ID_WATER // var/datum/looping_sound/water/soundloop CHOMPEdit: Removing soundloop for now. -/turf/simulated/floor/water/Initialize() +/turf/simulated/floor/water/Initialize(mapload) . = ..() update_icon() handle_fish() diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 400e0d405d..649109cedc 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -12,7 +12,7 @@ var/edge = FALSE //If we're an edge var/forced_dirs = 0 //Force this one to pretend it's an overedge turf -/turf/space/Initialize() +/turf/space/Initialize(mapload) if(CONFIG_GET(flag/starlight)) update_starlight() diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index e5a560a913..b60c420097 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -6,7 +6,7 @@ /turf/space/transit/attackby(obj/O as obj, mob/user as mob) return -/turf/space/transit/Initialize() +/turf/space/transit/Initialize(mapload) . = ..() toggle_transit(reverse_dir[pushdirection]) @@ -28,4 +28,4 @@ icon_state = "arrow-west" pushdirection = WEST -//------------------------ \ No newline at end of file +//------------------------ diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm index ccd22d213f..f78c211811 100644 --- a/code/game/turfs/unsimulated/beach.dm +++ b/code/game/turfs/unsimulated/beach.dm @@ -17,7 +17,7 @@ skip_init = FALSE movement_cost = 4 // Water should slow you down, just like simulated turf. -/turf/unsimulated/beach/water/Initialize() +/turf/unsimulated/beach/water/Initialize(mapload) . = ..() add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water2","layer"=MOB_LAYER+0.1)) @@ -36,7 +36,7 @@ icon_state = "desert" initial_flooring = /decl/flooring/sand/desert -/turf/simulated/floor/beach/sand/desert/Initialize() +/turf/simulated/floor/beach/sand/desert/Initialize(mapload) . = ..() if(prob(5)) icon_state = "desert[rand(0,4)]" @@ -57,7 +57,7 @@ movement_cost = 8 // Deep water should be difficult to wade through. initial_flooring = /decl/flooring/water/beach/deep -/turf/simulated/floor/beach/water/Initialize() +/turf/simulated/floor/beach/water/Initialize(mapload) . = ..() add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1)) diff --git a/code/game/turfs/unsimulated/planetary.dm b/code/game/turfs/unsimulated/planetary.dm index d73201c166..c075c9dbb0 100644 --- a/code/game/turfs/unsimulated/planetary.dm +++ b/code/game/turfs/unsimulated/planetary.dm @@ -18,7 +18,7 @@ temperature = T20C skip_init = FALSE -/turf/unsimulated/wall/planetary/Initialize() +/turf/unsimulated/wall/planetary/Initialize(mapload) . = ..() SSplanets.addTurf(src) diff --git a/code/game/turfs/unsimulated/sky_vr.dm b/code/game/turfs/unsimulated/sky_vr.dm index e14793b659..01e603052e 100644 --- a/code/game/turfs/unsimulated/sky_vr.dm +++ b/code/game/turfs/unsimulated/sky_vr.dm @@ -11,7 +11,7 @@ var/does_skyfall = TRUE var/list/skyfall_levels -/turf/unsimulated/floor/sky/Initialize() +/turf/unsimulated/floor/sky/Initialize(mapload) . = ..() if(does_skyfall && !LAZYLEN(skyfall_levels)) error("[x],[y],[z], [get_area(src)] doesn't have skyfall_levels defined! Can't skyfall!") diff --git a/code/game/vehicles/vehicle.dm b/code/game/vehicles/vehicle.dm index 4be9c75fd9..1fa4167541 100644 --- a/code/game/vehicles/vehicle.dm +++ b/code/game/vehicles/vehicle.dm @@ -53,7 +53,7 @@ -/obj/vehicle/Initialize() +/obj/vehicle/Initialize(mapload) . = ..() icon_state += "-unmanned" add_radio() diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm index 23d3712f70..b8c11f9824 100644 --- a/code/modules/ai/ai_holder.dm +++ b/code/modules/ai/ai_holder.dm @@ -14,7 +14,7 @@ var/datum/ai_holder/ai_holder = null var/ai_holder_type = null // Which ai_holder datum to give to the mob when initialized. If null, nothing happens. -/mob/living/Initialize() +/mob/living/Initialize(mapload) if(!ai_holder) initialize_ai_holder() return ..() @@ -29,7 +29,7 @@ ai_holder.manage_processing(AI_PROCESSING) return ..() -//Extracted from mob/living/Initialize() so that we may call it at any time after a mob was created +//Extracted from mob/living/Initialize(mapload) so that we may call it at any time after a mob was created /mob/living/proc/initialize_ai_holder() if(ai_holder) //Making double sure we clean up and properly GC the original ai_holder var/old_holder = ai_holder diff --git a/code/modules/artifice/cursedform.dm b/code/modules/artifice/cursedform.dm index 7b2f9648e6..fd8f806c60 100644 --- a/code/modules/artifice/cursedform.dm +++ b/code/modules/artifice/cursedform.dm @@ -1,7 +1,7 @@ /obj/item/paper/carbon/cursedform name = "Form - Inventory Requisition r10.7.1E" -/obj/item/paper/carbon/cursedform/Initialize() +/obj/item/paper/carbon/cursedform/Initialize(mapload) . = ..() info = {"

Form - Inventory Requisition r10.7.1E

General Request Form


General


Name:
Department:
Departmental Rank:
Organization(If not Nanotrasen):
Date:



Requested Item(s):
Quantity:
Reason for request:
Is this replacement equipment?:
If `Yes`; above, specify equiment and reason for replacement:


Authorization


Authorizing Department:
Authorizing Dept. Head:


Contact and Delivery


EPv2 Address of requesting party(Do not leave blank):
Delivery location or department:


Nanotrasen Employee Identification Number:
Signature of Requester and Date





Authorizor`s Nanotrasen Employee Identification Number:
Authorizing Signature and Date(Include authorizing department`s stamp below)




Shipping Department Only

(Do not write below this line)

Nanotrasen Purchasing Approval Code:
Nanotrasen Employee Identification Number:
Receiving Shipping Employee:
Signature and Date


"} info_links = {"

Form - Inventory Requisition r10.7.1E

General Request Form


General


Name: write
Department: write
Departmental Rank: write
Organization(If not Nanotrasen): write
Date: write



Requested Item(s): write
Quantity: write
Reason for request: write
Is this replacement equipment?: write
If `Yes` above, specify equiment and reason for replacement: write


Authorization


Authorizing Department: write
Authorizing Dept. Head: write


Contact and Delivery


EPv2 Address of requesting party(Do not leave blank): write
Delivery location or department: write


Nanotrasen Employee Identification Number: write
Signature of Requester and Date

write



Authorizor`s Nanotrasen Employee Identification Number: write
Authorizing Signature and Date(Include authorizing department`s stamp below)

write


Shipping Department Only

(Do not write below this line)

Nanotrasen Purchasing Approval Code: write
Nanotrasen Employee Identification Number: write
Receiving Shipping Employee: write
Signature and Date

write
write"} diff --git a/code/modules/artifice/telecube.dm b/code/modules/artifice/telecube.dm index cad2d3fcc1..7e315f02f6 100644 --- a/code/modules/artifice/telecube.dm +++ b/code/modules/artifice/telecube.dm @@ -51,7 +51,7 @@ var/omniteleport = FALSE // Will this teleport anchored things too? -/obj/item/telecube/Initialize() +/obj/item/telecube/Initialize(mapload) . = ..() glow = image("[icon_state]-ready") diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index c2117a60ab..a82dbcc96a 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -158,7 +158,7 @@ var/visible = 0 anchored = TRUE -/obj/effect/beam/i_beam/Initialize() +/obj/effect/beam/i_beam/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 0ecf76d099..1fcc8575ad 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -17,7 +17,7 @@ var/datum/radio_frequency/radio_connection var/deadman = FALSE -/obj/item/assembly/signaler/Initialize() +/obj/item/assembly/signaler/Initialize(mapload) . = ..() set_frequency(frequency) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 2f680bae5c..5501150427 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -30,10 +30,9 @@ // var/cause_of_death = null //TODO: set up a cause-of-death system. needs to support both damage types and actual wound types, so a body can have been bitten/stabbed/clawed/shot/burned/lasered/etc. to death delete_me = TRUE -/obj/effect/landmark/corpse/Initialize() - ..() +/obj/effect/landmark/corpse/Initialize(mapload) + . = ..() createCorpse() - return INITIALIZE_HINT_QDEL /obj/effect/landmark/corpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it. var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index dcd96fb8c9..b6f1e9bef1 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -9,7 +9,7 @@ var/active = 0 -/obj/machinery/gateway/Initialize() +/obj/machinery/gateway/Initialize(mapload) update_icon() if(dir == SOUTH) density = FALSE @@ -36,7 +36,7 @@ GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation) var/wait = 0 //this just grabs world.time at world start var/obj/machinery/gateway/centeraway/awaygate = null -/obj/machinery/gateway/centerstation/Initialize() +/obj/machinery/gateway/centerstation/Initialize(mapload) if(GLOB.gateway_station) warning("[src] at [x],[y],[z] appears to be an additional station-gateway") else @@ -252,7 +252,7 @@ GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway) /obj/machinery/gateway/centeraway/New() density = TRUE -/obj/machinery/gateway/centeraway/Initialize() +/obj/machinery/gateway/centeraway/Initialize(mapload) if(GLOB.gateway_away) warning("[src] at [x],[y],[z] appears to be an additional away-gateway") else diff --git a/code/modules/awaymissions/loot.dm b/code/modules/awaymissions/loot.dm index 507c4e624d..a1eab6276b 100644 --- a/code/modules/awaymissions/loot.dm +++ b/code/modules/awaymissions/loot.dm @@ -5,7 +5,7 @@ var/lootdoubles = 0 //if the same item can be spawned twice var/loot = "" //a list of possible items to spawn- a string of paths -/obj/effect/spawner/lootdrop/Initialize() +/obj/effect/spawner/lootdrop/Initialize(mapload) ..() var/list/things = params2list(loot) if(things && things.len) diff --git a/code/modules/awaymissions/overmap_renamer/debrisfield_renamer.dm b/code/modules/awaymissions/overmap_renamer/debrisfield_renamer.dm index ce6c762f51..a0621b0149 100644 --- a/code/modules/awaymissions/overmap_renamer/debrisfield_renamer.dm +++ b/code/modules/awaymissions/overmap_renamer/debrisfield_renamer.dm @@ -6,7 +6,7 @@ var/static/reference //Saves us from having to iterate over all visitable overmap obj instances more than once for the debris field. //Uncomment the testing lines when adding a new landmark and wanting to see if it loaded properly during server init. re-comment after done -/obj/effect/landmark/overmap_renamer/debris_field/Initialize() +/obj/effect/landmark/overmap_renamer/debris_field/Initialize(mapload) . = ..() if(!reference) // testing("First overmap descriptor, name: [name]") diff --git a/code/modules/awaymissions/overmap_renamer/overmap_renamer.dm b/code/modules/awaymissions/overmap_renamer/overmap_renamer.dm index a92e29a297..1fae96eea5 100644 --- a/code/modules/awaymissions/overmap_renamer/overmap_renamer.dm +++ b/code/modules/awaymissions/overmap_renamer/overmap_renamer.dm @@ -45,7 +45,7 @@ possible_descriptors are populated by subtypes of /obj/effect/landmark/overmap_r var/list/descriptors = list() //Elements: A = name, B = desc C = scanner desc. Each element must be a string // var/static/reference //exists to avoid having to iterate over the overmap objs list more than once. Commented out here. Add this to subtype -/obj/effect/landmark/overmap_renamer/Initialize() +/obj/effect/landmark/overmap_renamer/Initialize(mapload) // testing("Loading renamer landmark: [name]") //Uncomment when adding a new POI/Landmark for testing aid. if(LAZYLEN(descriptors) != 3) error("POI [name] renamer landmark is invalid! Make sure its descriptors var is a list of 3 elements!") diff --git a/code/modules/awaymissions/redgate.dm b/code/modules/awaymissions/redgate.dm index 33aa3f40d8..eba8db323b 100644 --- a/code/modules/awaymissions/redgate.dm +++ b/code/modules/awaymissions/redgate.dm @@ -117,7 +117,7 @@ else return ..() -/obj/structure/redgate/away/Initialize() +/obj/structure/redgate/away/Initialize(mapload) . = ..() if(!find_partner()) log_and_message_admins("An away redgate spawned but wasn't able to find a gateway to link to. If this appeared at roundstart, something has gone wrong, otherwise if you spawn another gate they should connect.") @@ -1483,7 +1483,7 @@ var/start_pos var/flag_return_delay = 3 SECONDS //how long you have to hold onto your team's flag before it returns home -/obj/item/laserdome_flag/Initialize() +/obj/item/laserdome_flag/Initialize(mapload) . = ..() start_pos = src.loc //save our starting location for later @@ -1618,7 +1618,7 @@ w_class = ITEMSIZE_NO_CONTAINER redgate_allowed = FALSE //you can't take the demonstration balls and go home either -/obj/item/laserdome_hyperball/Initialize() +/obj/item/laserdome_hyperball/Initialize(mapload) . = ..() start_pos = src.loc //save our starting location for later diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index 3e5527848f..31ee0bd112 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -62,7 +62,7 @@ //VOREStation Add - This landmark type so it's not so ghetto. /obj/effect/landmark/gateway_scatter name = "uncalibrated gateway destination" -/obj/effect/landmark/gateway_scatter/Initialize() +/obj/effect/landmark/gateway_scatter/Initialize(mapload) . = ..() awaydestinations += src @@ -72,7 +72,7 @@ /obj/effect/landmark/event_scatter name = "uncalibrated event destination" -/obj/effect/landmark/event_scatter/Initialize() +/obj/effect/landmark/event_scatter/Initialize(mapload) . = ..() eventdestinations += src @@ -82,13 +82,13 @@ /obj/effect/landmark/gateway_abduct_dest name = "abductor gateway destination" -/obj/effect/landmark/gateway_abduct_dest/Initialize() +/obj/effect/landmark/gateway_abduct_dest/Initialize(mapload) . = ..() awayabductors += src /obj/effect/landmark/event_abduct_dest name = "abductor event destination" -/obj/effect/landmark/event_abduct_dest/Initialize() +/obj/effect/landmark/event_abduct_dest/Initialize(mapload) . = ..() eventabductors += src //VOREStation Add End diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm index 6a3cf8249d..424e3b9ee3 100644 --- a/code/modules/blob2/blobs/base_blob.dm +++ b/code/modules/blob2/blobs/base_blob.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(all_blobs) var/base_name = "blob" // The name that gets appended along with the blob_type's name. var/faction = FACTION_BLOB -/obj/structure/blob/Initialize(newloc, new_overmind) +/obj/structure/blob/Initialize(mapload, new_overmind) if(new_overmind) overmind = new_overmind faction = overmind.blob_type.faction diff --git a/code/modules/blob2/blobs/core.dm b/code/modules/blob2/blobs/core.dm index 425cac85aa..b2acf6e7fa 100644 --- a/code/modules/blob2/blobs/core.dm +++ b/code/modules/blob2/blobs/core.dm @@ -95,8 +95,8 @@ var/list/blob_cores = list() /obj/structure/blob/core/classic desired_blob_type = /datum/blob_type/classic -/obj/structure/blob/core/Initialize(newloc, client/new_overmind = null, new_rate = 2, placed = 0) - . = ..(newloc) +/obj/structure/blob/core/Initialize(mapload, client/new_overmind = null, new_rate = 2, placed = 0) + . = ..() blob_cores += src START_PROCESSING(SSobj, src) update_icon() //so it atleast appears diff --git a/code/modules/blob2/blobs/resource.dm b/code/modules/blob2/blobs/resource.dm index 0cd3f06f10..745fc64c72 100644 --- a/code/modules/blob2/blobs/resource.dm +++ b/code/modules/blob2/blobs/resource.dm @@ -9,7 +9,7 @@ var/resource_delay = 0 var/resource_cooldown = 4 SECONDS -/obj/structure/blob/resource/Initialize(newloc, new_overmind) +/obj/structure/blob/resource/Initialize(mapload, new_overmind) if(overmind) overmind.resource_blobs += src return ..() diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm index 73fe9978c5..6db90f7e94 100644 --- a/code/modules/blob2/overmind/overmind.dm +++ b/code/modules/blob2/overmind/overmind.dm @@ -31,7 +31,7 @@ var/list/overminds = list() /mob/observer/blob/get_default_language() return default_language -/mob/observer/blob/Initialize(newloc, pre_placed = 0, starting_points = 60, desired_blob_type = null) +/mob/observer/blob/Initialize(mapload, pre_placed = 0, starting_points = 60, desired_blob_type = null) blob_points = starting_points if(pre_placed) //we already have a core! placed = 1 @@ -54,7 +54,7 @@ var/list/overminds = list() if(languages.len) default_language = languages[1] - return ..(newloc) + return ..() /mob/observer/blob/Destroy() for(var/obj/structure/blob/B as anything in GLOB.all_blobs) diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index edbf68e966..567ed209b1 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -35,7 +35,7 @@ var/datum/effect/effect/system/confetti_spread //CHOMPAdd var/confetti_strength = 5 //CHOMPAdd -/obj/structure/casino_table/roulette_table/Initialize() +/obj/structure/casino_table/roulette_table/Initialize(mapload) .=..() ball = new(src) return diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm index fa5a489ed1..e0039dccf9 100644 --- a/code/modules/casino/casino_prize_vendor.dm +++ b/code/modules/casino/casino_prize_vendor.dm @@ -60,7 +60,7 @@ var/category_implants = 1 var/category_event = 1 //For special events, holidays, etc -/obj/machinery/casino_prize_dispenser/Initialize() +/obj/machinery/casino_prize_dispenser/Initialize(mapload) . = ..() power_change() diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index c4c803bdbb..818760bd46 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(all_cataloguers) debug = TRUE -/obj/item/cataloguer/Initialize() +/obj/item/cataloguer/Initialize(mapload) GLOB.all_cataloguers += src return ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 9230f86723..d61ebc640c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -331,7 +331,7 @@ icon_state = "nothing" // Horribly illegal and shouldn't be a thing, but whatever. species_restricted = null -/obj/item/clothing/shoes/none/Initialize() +/obj/item/clothing/shoes/none/Initialize(mapload) . = ..() if(istype(loc, /mob)) // are we in a mob? var/mob/m = loc @@ -340,8 +340,7 @@ for(var/atom/movable/thing in contents) thing.loc = get_turf(src) moveToNullspace() // go to nullspace - spawn(1) - qdel(src) // die + QDEL_IN(src, 1) /obj/item/clothing/shoes/none/make_worn_icon(body_type, slot_name, inhands, default_icon, default_layer, icon/clip_mask) // override this to ensure that no worn icon is generated return diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm index 06b8d0caf0..5e51029174 100644 --- a/code/modules/client/stored_item.dm +++ b/code/modules/client/stored_item.dm @@ -52,7 +52,7 @@ return persist_name -/obj/machinery/item_bank/Initialize() +/obj/machinery/item_bank/Initialize(mapload) . = ..() /obj/machinery/item_bank/attack_hand(mob/living/user) diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm index 2d4ebe32b7..2a6accb6b5 100644 --- a/code/modules/clothing/accessories/accessory_vr.dm +++ b/code/modules/clothing/accessories/accessory_vr.dm @@ -155,7 +155,7 @@ var/code = 2 var/datum/radio_frequency/radio_connection -/obj/item/clothing/accessory/collar/shock/Initialize() +/obj/item/clothing/accessory/collar/shock/Initialize(mapload) . = ..() radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT) // Makes it so you don't need to change the frequency off of default for it to work. diff --git a/code/modules/clothing/accessories/rings.dm b/code/modules/clothing/accessories/rings.dm index 18c1bd3d2c..868893dc30 100644 --- a/code/modules/clothing/accessories/rings.dm +++ b/code/modules/clothing/accessories/rings.dm @@ -48,7 +48,7 @@ flags = OPENCONTAINER origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 4) -/obj/item/clothing/accessory/ring/reagent/Initialize() +/obj/item/clothing/accessory/ring/reagent/Initialize(mapload) . = ..() create_reagents(15) @@ -71,7 +71,7 @@ icon_state = "material" origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) -/obj/item/clothing/accessory/ring/reagent/sleepy/Initialize() +/obj/item/clothing/accessory/ring/reagent/sleepy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 15) // Less than a sleepy-pen, but still enough to knock someone out diff --git a/code/modules/clothing/accessories/storage.dm b/code/modules/clothing/accessories/storage.dm index 1a7ec234f6..3386963d0c 100644 --- a/code/modules/clothing/accessories/storage.dm +++ b/code/modules/clothing/accessories/storage.dm @@ -11,7 +11,7 @@ on_rolled = list("down" = "none") var/hide_on_roll = FALSE -/obj/item/clothing/accessory/storage/Initialize() +/obj/item/clothing/accessory/storage/Initialize(mapload) . = ..() hold = new/obj/item/storage/internal(src) hold.max_storage_space = slots * 2 @@ -94,7 +94,7 @@ icon_state = "unathiharness2" slots = 2 -/obj/item/clothing/accessory/storage/knifeharness/Initialize() +/obj/item/clothing/accessory/storage/knifeharness/Initialize(mapload) . = ..() hold.max_storage_space = ITEMSIZE_COST_SMALL * 2 hold.can_hold = list(/obj/item/material/knife/machete/hatchet/unathiknife,\ diff --git a/code/modules/clothing/accessories/torch.dm b/code/modules/clothing/accessories/torch.dm index 463a314f3b..5caf8bce93 100644 --- a/code/modules/clothing/accessories/torch.dm +++ b/code/modules/clothing/accessories/torch.dm @@ -212,7 +212,7 @@ badges badge_string = "Sol Central Government" slot_flags = SLOT_MASK | SLOT_TIE -/obj/item/clothing/accessory/badge/solgov/tags/Initialize() +/obj/item/clothing/accessory/badge/solgov/tags/Initialize(mapload) . = ..() var/mob/living/carbon/human/H H = get_holder_of_type(src, /mob/living/carbon/human) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index e1123b9c21..b6c3c79b3b 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -25,7 +25,7 @@ drop_sound = 'sound/items/drop/rubber.ogg' pickup_sound = 'sound/items/pickup/rubber.ogg' -/obj/item/clothing/gloves/fyellow/Initialize() +/obj/item/clothing/gloves/fyellow/Initialize(mapload) . = ..() //Picks a value between 0 and 1.25, in 5% increments // VOREStation edit var/shock_pick = rand(0,15) // VOREStation Edit diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index e72c53df07..c574c1f529 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -129,7 +129,7 @@ icon = 'icons/obj/clothing/ranger.dmi' icon_state = "ranger_gloves" -/obj/item/clothing/gloves/ranger/Initialize() +/obj/item/clothing/gloves/ranger/Initialize(mapload) . = ..() if(icon_state == "ranger_gloves") name = "[glovecolor] ranger gloves" diff --git a/code/modules/clothing/head/fishing.dm b/code/modules/clothing/head/fishing.dm index a72e2f0d34..6eb3cbc4f9 100644 --- a/code/modules/clothing/head/fishing.dm +++ b/code/modules/clothing/head/fishing.dm @@ -16,7 +16,7 @@ var/slogan = "" var/hatsize = 0 -/obj/item/clothing/head/fishing/Initialize() +/obj/item/clothing/head/fishing/Initialize(mapload) . = ..() //short phrases that women and fish may have about you var/feelings = list("love me", diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 6685641417..5dd877f04e 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -141,7 +141,7 @@ light_overlay = "helmet_light" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR -/obj/item/clothing/head/hardhat/ranger/Initialize() +/obj/item/clothing/head/hardhat/ranger/Initialize(mapload) . = ..() if(icon_state == "ranger_helmet") name = "[hatcolor] ranger helmet" diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm index 9cf4c70e9b..48ecff554f 100644 --- a/code/modules/clothing/head/pilot_helmet.dm +++ b/code/modules/clothing/head/pilot_helmet.dm @@ -21,7 +21,7 @@ var/list/raw_images var/last_status -/obj/item/clothing/head/pilot/Initialize() +/obj/item/clothing/head/pilot/Initialize(mapload) . = ..() images = list() diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 03b32c4541..f2c8908099 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -208,7 +208,7 @@ icon = 'icons/obj/clothing/ranger.dmi' icon_state = "ranger_boots" -/obj/item/clothing/shoes/boots/ranger/Initialize() +/obj/item/clothing/shoes/boots/ranger/Initialize(mapload) . = ..() if(icon_state == "ranger_boots") name = "[bootcolor] ranger boots" diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm index 3ef1987ce1..b64174dc97 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm @@ -17,7 +17,7 @@ passive_power_cost = 0 var/obj/item/kinetic_crusher/machete/gauntlets/rig/stored_gauntlets -/obj/item/rig_module/gauntlets/Initialize() +/obj/item/rig_module/gauntlets/Initialize(mapload) . = ..() stored_gauntlets = new /obj/item/kinetic_crusher/machete/gauntlets/rig(src) stored_gauntlets.storing_module = src diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index c55ca56a6e..161fd3a8c9 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -31,7 +31,7 @@ light_overlay = "helmet_light" light_range = 4 -/obj/item/clothing/head/helmet/space/Initialize() +/obj/item/clothing/head/helmet/space/Initialize(mapload) . = ..() if(camera_networks) verbs |= /obj/item/clothing/head/helmet/space/proc/toggle_camera @@ -92,7 +92,7 @@ var/list/supporting_limbs //If not-null, automatically splints breaks. Checked when removing the suit. //VOREStation edit start - use the specially refitted sprites by KBraid. Done this way to avoid breaking subtypes. -/obj/item/clothing/suit/space/Initialize() +/obj/item/clothing/suit/space/Initialize(mapload) . = ..() if(type == /obj/item/clothing/suit/space) LAZYSET(sprite_sheets, SPECIES_TESHARI, 'icons/inventory/suit/mob_vr_teshari.dmi') diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index 3c31bb4a4a..e6c94c784d 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -20,7 +20,7 @@ /obj/item/clothing/suit/space/void/responseteam/command name = "Mark VII-C Emergency Response Team Commander Suit" -/obj/item/clothing/suit/space/void/responseteam/command/Initialize() +/obj/item/clothing/suit/space/void/responseteam/command/Initialize(mapload) . = ..() attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/command) //autoinstall the helmet @@ -29,7 +29,7 @@ icon_state = "ertsuit_m" item_state = "ertsuit_m" -/obj/item/clothing/suit/space/void/responseteam/medical/Initialize() +/obj/item/clothing/suit/space/void/responseteam/medical/Initialize(mapload) . = ..() attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/medical) //autoinstall the helmet @@ -38,7 +38,7 @@ icon_state = "ertsuit_e" item_state = "ertsuit_e" -/obj/item/clothing/suit/space/void/responseteam/engineer/Initialize() +/obj/item/clothing/suit/space/void/responseteam/engineer/Initialize(mapload) . = ..() attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/engineer) //autoinstall the helmet @@ -47,7 +47,7 @@ icon_state = "ertsuit_s" item_state = "ertsuit_s" -/obj/item/clothing/suit/space/void/responseteam/security/Initialize() +/obj/item/clothing/suit/space/void/responseteam/security/Initialize(mapload) . = ..() attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/security) //autoinstall the helmet @@ -59,7 +59,7 @@ slowdown = 0 //light armor means no slowdown item_flags = NOSLIP //INBUILT NANOGALOSHES -/obj/item/clothing/suit/space/void/responseteam/janitor/Initialize() +/obj/item/clothing/suit/space/void/responseteam/janitor/Initialize(mapload) . = ..() attach_helmet(new /obj/item/clothing/head/helmet/space/void/responseteam/janitor) //autoinstall the helmet diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index e23aba8f8c..6ae5c8d9d2 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -50,7 +50,7 @@ var/no_cycle = FALSE //stop this item from being put in a cycler //Does it spawn with any Inbuilt devices? -/obj/item/clothing/suit/space/void/Initialize() +/obj/item/clothing/suit/space/void/Initialize(mapload) . = ..() if(boots && ispath(boots)) boots = new boots(src) diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index a78a89455c..7defa0346e 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -20,7 +20,7 @@ icon_override = 'icons/inventory/head/mob_vr.dmi' armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) -/obj/item/clothing/head/helmet/space/void/heck/Initialize() +/obj/item/clothing/head/helmet/space/void/heck/Initialize(mapload) . = ..() var/mutable_appearance/glass_overlay = mutable_appearance(icon, "hostile_env_glass") glass_overlay.appearance_flags = RESET_COLOR @@ -97,7 +97,7 @@ sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB sprite_sheets_obj = null -/obj/item/clothing/suit/space/void/autolok/Initialize() +/obj/item/clothing/suit/space/void/autolok/Initialize(mapload) . = ..() helmet = new /obj/item/clothing/head/helmet/space/void/autolok //autoinstall the helmet diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 509541094d..807389f9ae 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1195,7 +1195,7 @@ rolled_down = 0 rolled_sleeves = 0 -/obj/item/clothing/under/color/ranger/Initialize() +/obj/item/clothing/under/color/ranger/Initialize(mapload) . = ..() if(icon_state == "ranger_uniform") //allows for custom items name = "[unicolor] ranger uniform" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 54575c765c..1698c42fb7 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -182,7 +182,7 @@ /obj/item/clothing/gloves/bluespace/emagged emagged = TRUE -/obj/item/clothing/gloves/bluespace/emagged/Initialize() +/obj/item/clothing/gloves/bluespace/emagged/Initialize(mapload) . = ..() target_size = (rand(25,200)) /100 //ChompEDIT - set to our rule cap if(target_size < 0.25) //ChompEDIT - set to our rule cap diff --git a/code/modules/clothing/under/xenos/vox.dm b/code/modules/clothing/under/xenos/vox.dm index 9897fa5c6d..6828cc4315 100644 --- a/code/modules/clothing/under/xenos/vox.dm +++ b/code/modules/clothing/under/xenos/vox.dm @@ -27,7 +27,7 @@ slots = 3 -/obj/item/clothing/accessory/storage/vox/Initialize() +/obj/item/clothing/accessory/storage/vox/Initialize(mapload) . = ..() hold.max_storage_space = slots * ITEMSIZE_COST_NORMAL - hold.max_w_class = ITEMSIZE_NORMAL \ No newline at end of file + hold.max_w_class = ITEMSIZE_NORMAL diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 4548dd48fb..8d5f3bba1d 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -15,7 +15,7 @@ var/last_process_worldtime = 0 var/report_num = 0 -/obj/machinery/dnaforensics/Initialize() +/obj/machinery/dnaforensics/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/detectivework/tools/luminol.dm b/code/modules/detectivework/tools/luminol.dm index b2ba49d4cf..2c9dbf0607 100644 --- a/code/modules/detectivework/tools/luminol.dm +++ b/code/modules/detectivework/tools/luminol.dm @@ -8,6 +8,6 @@ possible_transfer_amounts = list(5,10) volume = 250 -/obj/item/reagent_containers/spray/luminol/Initialize() +/obj/item/reagent_containers/spray/luminol/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_LUMINOL, 250) diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index c194b3ba6d..667652e769 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -31,7 +31,7 @@ var/on_fire = 0 var/burn_time = 20 //if the rag burns for too long it turns to ashes -/obj/item/reagent_containers/glass/rag/Initialize() +/obj/item/reagent_containers/glass/rag/Initialize(mapload) . = ..() update_name() diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 4101cd4f17..8ff578f764 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -14,7 +14,7 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' -/obj/item/eftpos/Initialize() +/obj/item/eftpos/Initialize(mapload) . = ..() //by default, connect to the station account //the user of the EFTPOS device can change the target account though, and no-one will be the wiser (except whoever's being charged) diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm index 79446f2f5f..b3716d7ac5 100644 --- a/code/modules/economy/vending.dm +++ b/code/modules/economy/vending.dm @@ -81,7 +81,7 @@ var/can_rotate = 1 //Defaults to yes, can be set to 0 for vendors without or with unwanted directionals. -/obj/machinery/vending/Initialize() +/obj/machinery/vending/Initialize(mapload) . = ..() wires = new(src) if(product_slogans) diff --git a/code/modules/economy/vending_refills.dm b/code/modules/economy/vending_refills.dm index b818dd6d8f..310e801a0a 100644 --- a/code/modules/economy/vending_refills.dm +++ b/code/modules/economy/vending_refills.dm @@ -26,7 +26,7 @@ return TRUE return FALSE -/obj/item/refill_cartridge/autoname/Initialize() +/obj/item/refill_cartridge/autoname/Initialize(mapload) . = ..() if(refill_type && ispath(refill_type)) var/atom/tmp = refill_type diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index 29864e3fac..606843084e 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -46,7 +46,7 @@ var/global/list/emotes_by_key var/sound_preferences = list(/datum/preference/toggle/emote_noises) // Default emote sound_preferences is just emote_noises. Belch emote overrides this list for pref-checks. var/sound_vary = FALSE -/decl/emote/Initialize() +/decl/emote/Initialize(mapload) . = ..() if(key) LAZYSET(global.emotes_by_key, key, src) diff --git a/code/modules/entrepreneur/entrepreneur_items.dm b/code/modules/entrepreneur/entrepreneur_items.dm index eed81489ec..70dd320184 100644 --- a/code/modules/entrepreneur/entrepreneur_items.dm +++ b/code/modules/entrepreneur/entrepreneur_items.dm @@ -123,7 +123,7 @@ var/pisces = "" var/list/zodiacs = list("aries","taurus","gemini","cancer","leo","virgo","libra","scorpio","sagittarius","capricorn","aquarius","pisces") -/obj/item/entrepreneur/horoscope/Initialize() +/obj/item/entrepreneur/horoscope/Initialize(mapload) . = ..() var/stars = pick(stars_list) var/prediction = pick(prediction_list) @@ -396,7 +396,7 @@ icon_state = "crystal_pink" w_class = ITEMSIZE_TINY -/obj/item/entrepreneur/crystal/Initialize() +/obj/item/entrepreneur/crystal/Initialize(mapload) . = ..() var/list/colour_choice = list("crystal_pink","crystal_blue","crystal_green","crystal_orange","crystal_dblue","crystal_purple") icon_state = pick(colour_choice) diff --git a/code/modules/examine/descriptions/atmospherics.dm b/code/modules/examine/descriptions/atmospherics.dm index 6e39fadaa9..36871fc407 100644 --- a/code/modules/examine/descriptions/atmospherics.dm +++ b/code/modules/examine/descriptions/atmospherics.dm @@ -2,7 +2,7 @@ description_info = "This pipe, and all other pipes, can be connected or disconnected by a wrench. The internal pressure of the pipe must \ be less than 200 kPa above the ambient pressure to do this. More pipes can be obtained from the pipe dispenser." -/obj/machinery/atmospherics/pipe/Initialize() //This is needed or else 20+ lines of copypasta to dance around inheritence. +/obj/machinery/atmospherics/pipe/Initialize(mapload) //This is needed or else 20+ lines of copypasta to dance around inheritence. . = ..() description_info += "
Most pipes and atmospheric devices can be connected or disconnected with a wrench. The pipe's pressure must not be too high, \ or if it is a device, it must be turned off first." diff --git a/code/modules/fireworks/firework_launcher.dm b/code/modules/fireworks/firework_launcher.dm index 7700d76424..1bcd7d826e 100644 --- a/code/modules/fireworks/firework_launcher.dm +++ b/code/modules/fireworks/firework_launcher.dm @@ -11,7 +11,7 @@ var/last_launch var/launch_cooldown = 5 MINUTES -/obj/machinery/firework_launcher/Initialize() +/obj/machinery/firework_launcher/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/fishing/fishing_net.dm b/code/modules/fishing/fishing_net.dm index 51353d51a1..7a107be913 100644 --- a/code/modules/fishing/fishing_net.dm +++ b/code/modules/fishing/fishing_net.dm @@ -22,7 +22,7 @@ var/list/accepted_mobs = list(/mob/living/simple_mob/animal/passive/fish) -/obj/item/material/fishing_net/Initialize() +/obj/item/material/fishing_net/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index f741d6b888..eeb291c7d4 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -46,7 +46,7 @@ else ..() -/obj/item/material/fishing_rod/Initialize() +/obj/item/material/fishing_rod/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index a528fb9aab..8e2d003bfc 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -65,7 +65,7 @@ return 1 return 0 -/obj/item/reagent_containers/food/drinks/glass2/Initialize() +/obj/item/reagent_containers/food/drinks/glass2/Initialize(mapload) . = ..() icon_state = base_icon diff --git a/code/modules/food/drinkingglass/shaker.dm b/code/modules/food/drinkingglass/shaker.dm index 4ed66b69f5..0ea6be86a2 100644 --- a/code/modules/food/drinkingglass/shaker.dm +++ b/code/modules/food/drinkingglass/shaker.dm @@ -12,7 +12,7 @@ var/lid_color = "black" -/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/Initialize() +/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/Initialize(mapload) . = ..() lid_color = pick("black", "red", "blue") update_icon() @@ -29,7 +29,7 @@ base_icon = "protein_shake" desc = "NanoTrasen brand pre-done pre-workout mix. Also perfect for an empty stomach." -/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize() +/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize(mapload) . = ..() cut_overlays() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) diff --git a/code/modules/food/drinkingglass/shaker_vr.dm b/code/modules/food/drinkingglass/shaker_vr.dm index 4d2782a877..099556ea6b 100644 --- a/code/modules/food/drinkingglass/shaker_vr.dm +++ b/code/modules/food/drinkingglass/shaker_vr.dm @@ -5,7 +5,7 @@ base_icon = "protean_shake" desc = "A strangely unlabeled, unbranded pre-workout drink carton." -/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/Initialize() +/obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/Initialize(mapload) . = ..() cut_overlays() reagents.add_reagent(REAGENT_ID_LIQUIDPROTEAN, 50) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 25a941a243..1043c29f13 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -32,7 +32,7 @@ name = n_name -/obj/item/reagent_containers/food/Initialize() +/obj/item/reagent_containers/food/Initialize(mapload) . = ..() if ((center_of_mass_x || center_of_mass_y) && !pixel_x && !pixel_y) src.pixel_x = rand(-6.0, 6) //Randomizes postion diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index a4391e03f5..6120d90ed3 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -16,7 +16,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COLA, 30) @@ -28,7 +28,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/decaf_cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/decaf_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DECAFCOLA, 30) @@ -42,7 +42,7 @@ pickup_sound = 'sound/items/pickup/disk.ogg' cant_chance = 0 -/obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize() +/obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 30) @@ -54,7 +54,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize() +/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 30) @@ -65,7 +65,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/thirteenloko/Initialize() +/obj/item/reagent_containers/food/drinks/cans/thirteenloko/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_THIRTEENLOKO, 30) @@ -77,7 +77,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize() +/obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DRGIBB, 30) @@ -89,7 +89,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize() +/obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DIETDRGIBB, 30) @@ -101,7 +101,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/starkist/Initialize() +/obj/item/reagent_containers/food/drinks/cans/starkist/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BROWNSTAR, 30) @@ -113,7 +113,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/starkistdecaf/Initialize() +/obj/item/reagent_containers/food/drinks/cans/starkistdecaf/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BROWNSTARDECAF, 30) @@ -125,7 +125,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/space_up/Initialize() +/obj/item/reagent_containers/food/drinks/cans/space_up/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEUP, 30) @@ -137,7 +137,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/lemon_lime/Initialize() +/obj/item/reagent_containers/food/drinks/cans/lemon_lime/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_LEMONLIME, 30) @@ -149,7 +149,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/iced_tea/Initialize() +/obj/item/reagent_containers/food/drinks/cans/iced_tea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ICETEA, 30) @@ -161,7 +161,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/grape_juice/Initialize() +/obj/item/reagent_containers/food/drinks/cans/grape_juice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 30) @@ -173,7 +173,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/tonic/Initialize() +/obj/item/reagent_containers/food/drinks/cans/tonic/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TONIC, 30) @@ -184,7 +184,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/sodawater/Initialize() +/obj/item/reagent_containers/food/drinks/cans/sodawater/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODAWATER, 30) @@ -196,7 +196,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/gingerale/Initialize() +/obj/item/reagent_containers/food/drinks/cans/gingerale/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GINGERALE, 30) @@ -208,7 +208,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/root_beer/Initialize() +/obj/item/reagent_containers/food/drinks/cans/root_beer/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ROOTBEER, 30) @@ -222,7 +222,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/kvass/Initialize() +/obj/item/reagent_containers/food/drinks/cans/kvass/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_KVASS, 30) @@ -234,7 +234,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/kompot/Initialize() +/obj/item/reagent_containers/food/drinks/cans/kompot/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_KOMPOT, 30) @@ -245,7 +245,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/boda/Initialize() +/obj/item/reagent_containers/food/drinks/cans/boda/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODAWATER, 30) @@ -256,7 +256,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/bodaplus/Initialize() +/obj/item/reagent_containers/food/drinks/cans/bodaplus/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODAWATER, 15) reagents.add_reagent(pick(list( @@ -276,7 +276,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/redarmy/Initialize() +/obj/item/reagent_containers/food/drinks/cans/redarmy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_POTATOJUICE, 15) reagents.add_reagent(REAGENT_ID_SODAWATER, 15) @@ -288,7 +288,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/arstbru/Initialize() +/obj/item/reagent_containers/food/drinks/cans/arstbru/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TURNIPJUICE, 30) @@ -300,7 +300,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 25) reagents.add_reagent(REAGENT_ID_IRON, 5) @@ -314,7 +314,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/straw_cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/straw_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_STRAWSODA, 30) @@ -325,7 +325,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/apple_cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/apple_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_APPLESODA, 30) @@ -336,7 +336,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/lemon_cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/lemon_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_LEMONSODA, 30) @@ -347,7 +347,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/sarsaparilla/Initialize() +/obj/item/reagent_containers/food/drinks/cans/sarsaparilla/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SARSAPARILLA, 30) @@ -358,7 +358,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/grape_cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/grape_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GRAPESODA, 30) @@ -369,7 +369,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/orange_cola/Initialize() +/obj/item/reagent_containers/food/drinks/cans/orange_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ORANGESODA, 30) @@ -380,7 +380,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/baconsoda/Initialize() +/obj/item/reagent_containers/food/drinks/cans/baconsoda/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PORKSODA, 30) @@ -395,7 +395,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/bepis/Initialize() +/obj/item/reagent_containers/food/drinks/cans/bepis/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BEPIS, 30) @@ -407,7 +407,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize() +/obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 30) @@ -424,7 +424,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/icecoffee/Initialize() +/obj/item/reagent_containers/food/drinks/cans/icecoffee/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ICECOFFEE, 30) @@ -436,7 +436,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/buzz/Initialize() +/obj/item/reagent_containers/food/drinks/cans/buzz/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BUZZFUZZ, 30) @@ -448,7 +448,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/shambler/Initialize() +/obj/item/reagent_containers/food/drinks/cans/shambler/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SHAMBLERS, 30) @@ -460,7 +460,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize() +/obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPRITEDCRANBERRY, 30) @@ -473,7 +473,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/beercan/Initialize() +/obj/item/reagent_containers/food/drinks/cans/beercan/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BEER, 30) @@ -484,7 +484,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/cans/alecan/Initialize() +/obj/item/reagent_containers/food/drinks/cans/alecan/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ALE, 30) @@ -498,7 +498,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEPEACH, 60) @@ -510,7 +510,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEPEAR, 60) @@ -522,7 +522,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIECHERRY, 60) @@ -534,7 +534,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMELON, 60) @@ -546,7 +546,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEBANANA, 60) @@ -558,7 +558,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEROSE, 60) @@ -570,7 +570,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIELEMON, 60) @@ -582,7 +582,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEFRUIT, 60) @@ -594,7 +594,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIESPECIAL, 60) @@ -609,7 +609,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGASIGHT, 60) @@ -621,7 +621,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGAHEART, 60) @@ -633,7 +633,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGASLEEP, 60) @@ -645,7 +645,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGASHOCK, 60) @@ -657,7 +657,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGAFAST, 60) @@ -669,7 +669,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGAHIGH, 60) @@ -681,7 +681,7 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGASHRINK, 60) @@ -693,6 +693,6 @@ center_of_mass_y = 8 volume = 60 -/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize() +/obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUKIEMEGAGROWTH, 60) diff --git a/code/modules/food/food/cans_ch.dm b/code/modules/food/food/cans_ch.dm index b4abaa7bd6..e5b88863e0 100644 --- a/code/modules/food/food/cans_ch.dm +++ b/code/modules/food/food/cans_ch.dm @@ -6,6 +6,6 @@ volume = 150 drop_sound = 'sound/items/drop/food.ogg' -/obj/item/reagent_containers/food/drinks/cans/waterbottle/wataur/Initialize() +/obj/item/reagent_containers/food/drinks/cans/waterbottle/wataur/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 120) diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 776c1e9814..d18650cd96 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -180,63 +180,63 @@ desc = "Used in cooking various dishes." icon_state = "enzyme" -/obj/item/reagent_containers/food/condiment/enzyme/Initialize() +/obj/item/reagent_containers/food/condiment/enzyme/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ENZYME, 50) -/obj/item/reagent_containers/food/condiment/sugar/Initialize() +/obj/item/reagent_containers/food/condiment/sugar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 50) -/obj/item/reagent_containers/food/condiment/ketchup/Initialize() +/obj/item/reagent_containers/food/condiment/ketchup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_KETCHUP, 50) -/obj/item/reagent_containers/food/condiment/mustard/Initialize() +/obj/item/reagent_containers/food/condiment/mustard/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MUSTARD, 50) -/obj/item/reagent_containers/food/condiment/hotsauce/Initialize() +/obj/item/reagent_containers/food/condiment/hotsauce/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 50) /obj/item/reagent_containers/food/condiment/cookingoil name = REAGENT_COOKINGOIL -/obj/item/reagent_containers/food/condiment/cookingoil/Initialize() +/obj/item/reagent_containers/food/condiment/cookingoil/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COOKINGOIL, 50) /obj/item/reagent_containers/food/condiment/cornoil name = REAGENT_CORNOIL -/obj/item/reagent_containers/food/condiment/cornoil/Initialize() +/obj/item/reagent_containers/food/condiment/cornoil/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CORNOIL, 50) -/obj/item/reagent_containers/food/condiment/coldsauce/Initialize() +/obj/item/reagent_containers/food/condiment/coldsauce/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FROSTOIL, 50) -/obj/item/reagent_containers/food/condiment/soysauce/Initialize() +/obj/item/reagent_containers/food/condiment/soysauce/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SOYSAUCE, 50) -/obj/item/reagent_containers/food/condiment/vinegar/Initialize() +/obj/item/reagent_containers/food/condiment/vinegar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_VINEGAR, 50) /obj/item/reagent_containers/food/condiment/yeast name = REAGENT_YEAST -/obj/item/reagent_containers/food/condiment/yeast/Initialize() +/obj/item/reagent_containers/food/condiment/yeast/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_YEAST, 50) /obj/item/reagent_containers/food/condiment/sprinkles name = REAGENT_SPRINKLES -/obj/item/reagent_containers/food/condiment/sprinkles/Initialize() +/obj/item/reagent_containers/food/condiment/sprinkles/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPRINKLES, 50) @@ -257,7 +257,7 @@ center_of_mass_x = 17 center_of_mass_y = 11 -/obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize() +/obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 20) @@ -268,7 +268,7 @@ center_of_mass_x = 17 center_of_mass_y = 11 -/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize() +/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 20) @@ -279,7 +279,7 @@ center_of_mass_x = 17 center_of_mass_y = 11 -/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize() +/obj/item/reagent_containers/food/condiment/small/peppermill/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 30) @@ -288,7 +288,7 @@ desc = "Sweetness in a bottle" icon_state = "sugarsmall" -/obj/item/reagent_containers/food/condiment/small/sugar/Initialize() +/obj/item/reagent_containers/food/condiment/small/sugar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 20) @@ -306,7 +306,7 @@ desc = "Contains 5u of table salt." icon_state = "packet_small_white" -/obj/item/reagent_containers/food/condiment/small/packet/salt/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/salt/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 5) @@ -315,7 +315,7 @@ desc = "Contains 5u of black pepper." icon_state = "packet_small_black" -/obj/item/reagent_containers/food/condiment/small/packet/pepper/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/pepper/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 5) @@ -324,7 +324,7 @@ desc = "Contains 5u of refined sugar." icon_state = "packet_small_white" -/obj/item/reagent_containers/food/condiment/small/packet/sugar/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/sugar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 5) @@ -334,7 +334,7 @@ icon_state = "packet_medium" volume = 10 -/obj/item/reagent_containers/food/condiment/small/packet/jelly/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 10) @@ -344,7 +344,7 @@ icon_state = "packet_medium" volume = 10 -/obj/item/reagent_containers/food/condiment/small/packet/honey/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/honey/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HONEY, 10) @@ -353,7 +353,7 @@ desc = "Contains 5u of hot sauce. Enjoy in moderation." icon_state = "packet_small_red" -/obj/item/reagent_containers/food/condiment/small/packet/capsaicin/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/capsaicin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 5) @@ -362,7 +362,7 @@ desc = "Contains 5u of ketchup." icon_state = "packet_small_red" -/obj/item/reagent_containers/food/condiment/small/packet/ketchup/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/ketchup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_KETCHUP, 5) @@ -371,7 +371,7 @@ desc = "Contains 5u of mayonnaise." icon_state = "packet_small_white" -/obj/item/reagent_containers/food/condiment/small/packet/mayo/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/mayo/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MAYO, 5) @@ -380,7 +380,7 @@ desc = "Contains 5u of soy sauce." icon_state = "packet_small_black" -/obj/item/reagent_containers/food/condiment/small/packet/soy/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/soy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SOYSAUCE, 5) @@ -388,7 +388,7 @@ name = "coffee powder packet" desc = "Contains 5u of coffee powder. Mix with 25u of water and heat." -/obj/item/reagent_containers/food/condiment/small/packet/coffee/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/coffee/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COFFEEPOWDER, 5) @@ -396,7 +396,7 @@ name = "tea powder packet" desc = "Contains 5u of black tea powder. Mix with 25u of water and heat." -/obj/item/reagent_containers/food/condiment/small/packet/tea/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/tea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TEA, 5) @@ -404,7 +404,7 @@ name = "cocoa powder packet" desc = "Contains 5u of cocoa powder. Mix with 25u of water and heat." -/obj/item/reagent_containers/food/condiment/small/packet/cocoa/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/cocoa/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COCO, 5) @@ -412,7 +412,7 @@ name = "grape juice powder packet" desc = "Contains 5u of powdered grape juice. Mix with 15u of water." -/obj/item/reagent_containers/food/condiment/small/packet/grape/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/grape/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_INSTANTGRAPE, 5) @@ -420,7 +420,7 @@ name = "orange juice powder packet" desc = "Contains 5u of powdered orange juice. Mix with 15u of water." -/obj/item/reagent_containers/food/condiment/small/packet/orange/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/orange/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_INSTANTORANGE, 5) @@ -428,7 +428,7 @@ name = "watermelon juice powder packet" desc = "Contains 5u of powdered watermelon juice. Mix with 15u of water." -/obj/item/reagent_containers/food/condiment/small/packet/watermelon/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/watermelon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_INSTANTWATERMELON, 5) @@ -436,7 +436,7 @@ name = "apple juice powder packet" desc = "Contains 5u of powdered apple juice. Mix with 15u of water." -/obj/item/reagent_containers/food/condiment/small/packet/apple/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/apple/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_INSTANTAPPLE, 5) @@ -446,7 +446,7 @@ icon_state = "packet_medium" volume = 10 -/obj/item/reagent_containers/food/condiment/small/packet/protein/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/protein/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -454,31 +454,31 @@ name = "crayon powder packet" desc = "Contains 10u of powdered crayon. Mix with 30u of water." volume = 10 -/obj/item/reagent_containers/food/condiment/small/packet/crayon/generic/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/generic/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUST, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/red/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/red/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTRED, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/orange/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/orange/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTORANGE, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/yellow/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/yellow/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTYELLOW, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/green/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/green/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTGREEN, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/blue/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/blue/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTBLUE, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/purple/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/purple/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTPURPLE, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/grey/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/grey/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTGREY, 10) -/obj/item/reagent_containers/food/condiment/small/packet/crayon/brown/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/crayon/brown/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CRAYONDUSTBROWN, 10) @@ -497,7 +497,7 @@ update_icon() return -/obj/item/reagent_containers/food/condiment/carton/flour/Initialize() +/obj/item/reagent_containers/food/condiment/carton/flour/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FLOUR, 200) randpixel_xy() @@ -529,7 +529,7 @@ update_icon() return -/obj/item/reagent_containers/food/condiment/carton/sugar/Initialize() +/obj/item/reagent_containers/food/condiment/carton/sugar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 100) @@ -549,7 +549,7 @@ /obj/item/reagent_containers/food/condiment/spacespice/on_reagent_change() return -/obj/item/reagent_containers/food/condiment/spacespice/Initialize() +/obj/item/reagent_containers/food/condiment/spacespice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACESPICE, 40) @@ -558,7 +558,7 @@ desc = "Contains 5u of regular protein powder. Mix with 25u of water and enjoy." icon_state = "protein_powder1" -/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEINPOWDER, 5) @@ -567,7 +567,7 @@ desc = "Contains 5u of vanilla flavored protein powder. Mix with 25u of water and enjoy." icon_state = "protein_powder2" -/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_VANILLAPROTEINPOWDER, 5) @@ -576,7 +576,7 @@ desc = "Contains 5u of banana flavored protein powder. Mix with 25u of water and enjoy." icon_state = "protein_powder3" -/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BANANAPROTEINPOWDER, 5) @@ -585,7 +585,7 @@ desc = "Contains 5u of chocolate flavored protein powder. Mix with 25u of water and enjoy." icon_state = "protein_powder4" -/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHOCOLATEPROTEINPOWDER, 5) @@ -594,6 +594,6 @@ desc = "Contains 5u of strawberry flavored protein powder. Mix with 25u of water and enjoy." icon_state = "protein_powder5" -/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry/Initialize() +/obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_STRAWBERRYPROTEINPOWDER, 5) diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 34207a6fba..ea54e9ece5 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -19,7 +19,7 @@ /// Yims food_can_insert_micro = TRUE -/obj/item/reagent_containers/food/drinks/Initialize() +/obj/item/reagent_containers/food/drinks/Initialize(mapload) . = ..() if (prob(cant_chance)) cant_open = 1 @@ -251,7 +251,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/milk/Initialize() +/obj/item/reagent_containers/food/drinks/milk/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MILK, 50) @@ -266,7 +266,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/soymilk/Initialize() +/obj/item/reagent_containers/food/drinks/soymilk/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SOYMILK, 50) @@ -282,7 +282,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/smallmilk/Initialize() +/obj/item/reagent_containers/food/drinks/smallmilk/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MILK, 30) @@ -298,7 +298,7 @@ drop_sound = 'sound/items/drop/cardboardbox.ogg' pickup_sound = 'sound/items/pickup/cardboardbox.ogg' -/obj/item/reagent_containers/food/drinks/smallchocmilk/Initialize() +/obj/item/reagent_containers/food/drinks/smallchocmilk/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHOCOLATEMILK, 30) @@ -313,7 +313,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/coffee/Initialize() +/obj/item/reagent_containers/food/drinks/coffee/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COFFEE, 30) @@ -329,7 +329,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/tea/Initialize() +/obj/item/reagent_containers/food/drinks/tea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TEA, 30) @@ -345,7 +345,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/decaf_tea/Initialize() +/obj/item/reagent_containers/food/drinks/decaf_tea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TEADECAF, 30) @@ -355,7 +355,7 @@ icon_state = "ice" center_of_mass_x = 15 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/ice/Initialize() +/obj/item/reagent_containers/food/drinks/ice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ICE, 30) @@ -371,7 +371,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/h_chocolate/Initialize() +/obj/item/reagent_containers/food/drinks/h_chocolate/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HOTCOCO, 30) @@ -387,7 +387,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/greentea/Initialize() +/obj/item/reagent_containers/food/drinks/greentea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GREENTEA, 30) @@ -403,7 +403,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/chaitea/Initialize() +/obj/item/reagent_containers/food/drinks/chaitea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHAITEA, 30) @@ -419,7 +419,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/decaf/Initialize() +/obj/item/reagent_containers/food/drinks/decaf/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DECAF, 30) @@ -434,7 +434,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/dry_ramen/Initialize() +/obj/item/reagent_containers/food/drinks/dry_ramen/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DRYRAMEN, 30) @@ -449,7 +449,7 @@ drop_sound = 'sound/items/drop/papercup.ogg' pickup_sound = 'sound/items/pickup/papercup.ogg' -/obj/item/reagent_containers/food/drinks/sillycup/Initialize() +/obj/item/reagent_containers/food/drinks/sillycup/Initialize(mapload) . = ..() /obj/item/reagent_containers/food/drinks/sillycup/on_reagent_change() diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index 1eb10f58b8..f353a25139 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -16,7 +16,7 @@ /obj/item/reagent_containers/food/drinks/bottle/on_reagent_change() return // To suppress price updating. Bottles have their own price tags. -/obj/item/reagent_containers/food/drinks/bottle/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/Initialize(mapload) . = ..() if(isGlass) unacidable = TRUE @@ -227,7 +227,7 @@ center_of_mass_x = 16 center_of_mass_y = 4 -/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/gin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GIN, 100) @@ -238,7 +238,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WHISKEY, 100) @@ -249,7 +249,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPECIALWHISKEY, 100) @@ -260,7 +260,7 @@ center_of_mass_x = 17 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_VODKA, 100) @@ -271,7 +271,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/tequila/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/tequila/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TEQUILA, 100) @@ -282,7 +282,7 @@ center_of_mass_x = 17 center_of_mass_y = 5 -/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NOTHING, 100) @@ -293,7 +293,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/patron/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PATRON, 100) @@ -304,7 +304,7 @@ center_of_mass_x = 16 center_of_mass_y = 8 -/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/rum/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_RUM, 100) @@ -315,7 +315,7 @@ center_of_mass_x = 17 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/holywater/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HOLYWATER, 100) @@ -326,7 +326,7 @@ center_of_mass_x = 17 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_VERMOUTH, 100) @@ -337,7 +337,7 @@ center_of_mass_x = 17 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_KAHLUA, 100) @@ -348,7 +348,7 @@ center_of_mass_x = 15 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GOLDSCHLAGER, 100) @@ -359,7 +359,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COGNAC, 100) @@ -370,7 +370,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ABSINTHE, 100) @@ -381,7 +381,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MELONLIQUOR, 100) @@ -392,7 +392,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLUECURACAO, 100) @@ -403,7 +403,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_UNATHILIQUOR, 100) @@ -414,7 +414,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SCHNAPPSPEP, 100) @@ -425,7 +425,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/peachschnapps/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/peachschnapps/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SCHNAPPSPEA, 100) @@ -436,7 +436,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SCHNAPPSLEM, 100) @@ -447,7 +447,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/jager/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/jager/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_JAGER, 100) @@ -460,7 +460,7 @@ center_of_mass_x = 16 center_of_mass_y = 4 -/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/wine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_REDWINE, 100) @@ -471,7 +471,7 @@ center_of_mass_x = 16 center_of_mass_y = 4 -/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WHITEWINE, 100) @@ -482,7 +482,7 @@ center_of_mass_x = 16 center_of_mass_y = 4 -/obj/item/reagent_containers/food/drinks/bottle/carnoth/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/carnoth/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CARNOTH, 100) @@ -493,7 +493,7 @@ center_of_mass_x = 16 center_of_mass_y = 4 -/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PWINE, 100) @@ -504,7 +504,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHAMPAGNE, 100) @@ -515,7 +515,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SAKE, 100) @@ -528,7 +528,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/cola/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COLA, 100) @@ -539,7 +539,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/decaf_cola/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/decaf_cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DECAFCOLA, 100) @@ -550,7 +550,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEUP, 100) @@ -561,7 +561,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 100) @@ -572,7 +572,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/dr_gibb/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/dr_gibb/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DRGIBB, 100) @@ -585,7 +585,7 @@ center_of_mass_y = 7 isGlass = 0 -/obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 100) @@ -598,7 +598,7 @@ center_of_mass_y = 7 isGlass = 0 -/obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_APPLEJUICE, 100) @@ -611,7 +611,7 @@ center_of_mass_y = 9 isGlass = 0 -/obj/item/reagent_containers/food/drinks/bottle/milk/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/milk/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MILK, 100) @@ -624,7 +624,7 @@ center_of_mass_y = 8 isGlass = 0 -/obj/item/reagent_containers/food/drinks/bottle/cream/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/cream/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CREAM, 100) @@ -637,7 +637,7 @@ center_of_mass_y = 8 isGlass = 0 -/obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 100) @@ -650,7 +650,7 @@ center_of_mass_y = 8 isGlass = 0 -/obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_LIMEJUICE, 100) @@ -663,7 +663,7 @@ center_of_mass_y = 8 isGlass = 0 -/obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_LEMONJUICE, 100) @@ -674,7 +674,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GRENADINE, 100) @@ -685,7 +685,7 @@ center_of_mass_x = 16 center_of_mass_y = 3 -/obj/item/reagent_containers/food/drinks/bottle/grapejuice/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/grapejuice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 100) @@ -705,7 +705,7 @@ center_of_mass_x = 16 center_of_mass_y = 12 -/obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BEER, 50) @@ -727,7 +727,7 @@ description_fluff = "Lite-Speed is Spacer Beer's light brand, and despite being widely considered inferior in every regard, it's still pretty cheap. The lower alcohol content also appeals to some Skrell, for whom full-strength beer is too strong." icon_state = "beerlite" -/obj/item/reagent_containers/food/drinks/bottle/small/litebeer/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/litebeer/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_LITEBEER, 50) @@ -738,7 +738,7 @@ center_of_mass_x = 16 center_of_mass_y = 12 -/obj/item/reagent_containers/food/drinks/bottle/small/cider/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/cider/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CIDER, 50) @@ -750,7 +750,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ALE, 50) @@ -760,7 +760,7 @@ description_fluff = "Named for one of history's most infamous pirates, Qar’raqel, who ruled over Natuna before suffering a mysterious fate. This ale is brewed on Sif by a small company... Owned by Centauri Provisions." icon_state = "alebottle2" -/obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ALE, 50) @@ -773,7 +773,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/small/cola/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/cola/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COLA, 50) @@ -784,7 +784,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/small/space_up/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/space_up/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEUP, 50) @@ -795,7 +795,7 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 50) @@ -806,6 +806,6 @@ center_of_mass_x = 16 center_of_mass_y = 6 -/obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DRGIBB, 50) diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index c481fec937..3f60de7665 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -140,7 +140,7 @@ volume = 100 matter = list(MAT_PLASTIC = 2000) -/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/Initialize() +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/Initialize(mapload) . = ..() icon_state = pick("fitness-cup_black", "fitness-cup_red", "fitness-cup_black") @@ -168,7 +168,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake name = "protein shake" -/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake/Initialize() +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) reagents.add_reagent(REAGENT_ID_IRON, 10) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index c0277b3e2a..e8c52749cf 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -51,7 +51,7 @@ /// Yems. food_can_insert_micro = TRUE -/obj/item/reagent_containers/food/snacks/Initialize() +/obj/item/reagent_containers/food/snacks/Initialize(mapload) . = ..() if(nutriment_amt) reagents.add_reagent(REAGENT_ID_NUTRIMENT,(nutriment_amt*2),nutriment_desc) @@ -502,7 +502,7 @@ // icon_state = "xburger" //Refers to an icon in food.dmi // nutriment_amt = 2 //How much nutriment to add. // bitesize = 3 //This is the amount each bite consumes. -///obj/item/reagent_containers/food/snacks/xenoburger/Initialize() //Don't mess with this. (We use Initialize now instead of New()) +///obj/item/reagent_containers/food/snacks/xenoburger/Initialize(mapload) //Don't mess with this. (We use Initialize now instead of New()) // . = ..() //Same here. // reagents.add_reagent("xenomicrobes", 10) //This is what is in the food item. you may copy/paste this line of code for all the contents. @@ -521,7 +521,7 @@ nutriment_desc = list("apples" = 3,"salad" = 5) bitesize = 3 -/obj/item/reagent_containers/food/snacks/aesirsalad/Initialize() +/obj/item/reagent_containers/food/snacks/aesirsalad/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DOCTORSDELIGHT, 8) reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 8) @@ -534,7 +534,7 @@ nutriment_desc = list("candy" = 10) bitesize = 5 -/obj/item/reagent_containers/food/snacks/candy/donor/Initialize() +/obj/item/reagent_containers/food/snacks/candy/donor/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 3) @@ -550,7 +550,7 @@ nutriment_desc = list("candy corn" = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/candy_corn/Initialize() +/obj/item/reagent_containers/food/snacks/candy_corn/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) @@ -565,7 +565,7 @@ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5) bitesize = 2 -/obj/item/reagent_containers/food/snacks/chocolatebar/Initialize() +/obj/item/reagent_containers/food/snacks/chocolatebar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) reagents.add_reagent(REAGENT_ID_COCO, 2) @@ -605,7 +605,7 @@ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5) bitesize = 2 -/obj/item/reagent_containers/food/snacks/chocolateegg/Initialize() +/obj/item/reagent_containers/food/snacks/chocolateegg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) reagents.add_reagent(REAGENT_ID_COCO, 2) @@ -626,7 +626,7 @@ name = "plain donut" icon_state = "donut" desc = "A plain ol' donut." -/obj/item/reagent_containers/food/snacks/donut/plain/Initialize() +/obj/item/reagent_containers/food/snacks/donut/plain/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -634,7 +634,7 @@ name = "plain jelly donut" icon_state = "jelly" desc = "At least this one has jelly!" -/obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -644,7 +644,7 @@ icon_state = "donut_pink" desc = "This one has pink frosting!" overlay_state = "donut_pink_inbox" -/obj/item/reagent_containers/food/snacks/donut/pink/Initialize() +/obj/item/reagent_containers/food/snacks/donut/pink/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -652,7 +652,7 @@ name = "pink frosted jelly donut" icon_state = "jelly_pink" desc = "This one has pink frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -662,7 +662,7 @@ icon_state = "donut_purple" desc = "This one has purple frosting!" overlay_state = "donut_purple_inbox" -/obj/item/reagent_containers/food/snacks/donut/purple/Initialize() +/obj/item/reagent_containers/food/snacks/donut/purple/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -670,7 +670,7 @@ name = "purple frosted jelly donut" icon_state = "jelly_purple" desc = "This one has purple frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -680,7 +680,7 @@ icon_state = "donut_green" desc = "This one has green frosting!" overlay_state = "donut_green_inbox" -/obj/item/reagent_containers/food/snacks/donut/green/Initialize() +/obj/item/reagent_containers/food/snacks/donut/green/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -688,7 +688,7 @@ name = "green frosted jelly donut" icon_state = "jelly_green" desc = "This one has green frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -698,7 +698,7 @@ icon_state = "donut_beige" desc = "This one has beige frosting!" overlay_state = "donut_beige_inbox" -/obj/item/reagent_containers/food/snacks/donut/beige/Initialize() +/obj/item/reagent_containers/food/snacks/donut/beige/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -706,7 +706,7 @@ name = "beige frosted jelly donut" icon_state = "jelly_beige" desc = "This one has beige frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -716,7 +716,7 @@ icon_state = "donut_choc" desc = "This one has chocolate frosting!" overlay_state = "donut_choc_inbox" -/obj/item/reagent_containers/food/snacks/donut/choc/Initialize() +/obj/item/reagent_containers/food/snacks/donut/choc/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_CHOCOLATE, 5) @@ -725,7 +725,7 @@ name = "chocolate frosted jelly donut" icon_state = "jelly_choc" desc = "This one has chocolate frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -736,7 +736,7 @@ icon_state = "donut_blue" desc = "This one has blue frosting!" overlay_state = "donut_blue_inbox" -/obj/item/reagent_containers/food/snacks/donut/blue/Initialize() +/obj/item/reagent_containers/food/snacks/donut/blue/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -744,7 +744,7 @@ name = "blue frosted jelly donut" icon_state = "jelly_blue" desc = "This one has blue frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -754,7 +754,7 @@ icon_state = "donut_yellow" desc = "This one has yellow frosting!" overlay_state = "donut_yellow_inbox" -/obj/item/reagent_containers/food/snacks/donut/yellow/Initialize() +/obj/item/reagent_containers/food/snacks/donut/yellow/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -762,7 +762,7 @@ name = "yellow frosted jelly donut" icon_state = "jelly_yellow" desc = "This one has yellow frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -772,7 +772,7 @@ icon_state = "donut_olive" desc = "This one has olive frosting!" overlay_state = "donut_olive_inbox" -/obj/item/reagent_containers/food/snacks/donut/olive/Initialize() +/obj/item/reagent_containers/food/snacks/donut/olive/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -780,7 +780,7 @@ name = "olive frosted jelly donut" icon_state = "jelly_olive" desc = "This one has olive frosting and a jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -790,7 +790,7 @@ icon_state = "donut_homer" desc = "It's a d'ohnut!" overlay_state = "donut_homer_inbox" -/obj/item/reagent_containers/food/snacks/donut/homer/Initialize() +/obj/item/reagent_containers/food/snacks/donut/homer/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) @@ -799,7 +799,7 @@ name = "frosted jelly donut with sprinkles" icon_state = "jelly_homer" desc = "It's a d'ohnut with jelly filling!" -/obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) @@ -810,7 +810,7 @@ icon_state = "donut_choc_sprinkles" desc = "Mmm, chocolate with sprinkles... approaching maximum donut." overlay_state = "donut_choc_sprinkles_inbox" -/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize() +/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) @@ -820,7 +820,7 @@ name = "chocolate sprinkles jelly donut" icon_state = "jelly_choc_sprinkles" desc = "Pretty sure this is the most sugar you can pack into a donut." -/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) @@ -832,7 +832,7 @@ icon_state = "donut_meat" desc = "This donut has ... meat? Is it made of meat?!" overlay_state = "donut_meat_inbox" -/obj/item/reagent_containers/food/snacks/donut/meat/Initialize() +/obj/item/reagent_containers/food/snacks/donut/meat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3, nutriment_desc) @@ -841,7 +841,7 @@ icon_state = "donut_laugh" desc = "Try not to laugh." overlay_state = "donut_laugh_inbox" -/obj/item/reagent_containers/food/snacks/donut/laugh/Initialize() +/obj/item/reagent_containers/food/snacks/donut/laugh/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) @@ -849,7 +849,7 @@ name = "laugh jelly donut" icon_state = "jelly_laugh" desc = "Try not to be jelly." -/obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) @@ -864,7 +864,7 @@ bitesize = 10 overlay_state = "donut_chaos_inbox" -/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize() +/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) switch(rand(1,10)) @@ -892,21 +892,21 @@ /obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry filling_color = "#ED1169" -/obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry/Initialize() +/obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly filling_color = "#ED1169" -/obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly filling_color = "#ED1169" -/obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) @@ -920,7 +920,7 @@ center_of_mass_x = 16 center_of_mass_y = 13 -/obj/item/reagent_containers/food/snacks/egg/Initialize() +/obj/item/reagent_containers/food/snacks/egg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_EGG, 3) @@ -988,7 +988,7 @@ center_of_mass_y = 14 bitesize = 1 -/obj/item/reagent_containers/food/snacks/friedegg/Initialize() +/obj/item/reagent_containers/food/snacks/friedegg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -1000,7 +1000,7 @@ icon_state = "egg" filling_color = "#FFFFFF" -/obj/item/reagent_containers/food/snacks/boiledegg/Initialize() +/obj/item/reagent_containers/food/snacks/boiledegg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -1014,7 +1014,7 @@ center_of_mass_y = 16 bitesize = 3 -/obj/item/reagent_containers/food/snacks/organ/Initialize() +/obj/item/reagent_containers/food/snacks/organ/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, rand(3,5)) reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,3)) @@ -1064,7 +1064,7 @@ var/toxin_type = REAGENT_ID_CARPOTOXIN var/toxin_amount = 3 -/obj/item/reagent_containers/food/snacks/carpmeat/Initialize() +/obj/item/reagent_containers/food/snacks/carpmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 3) if(toxin_type && toxin_amount) @@ -1100,7 +1100,7 @@ bitesize = 2 trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/crab_legs/Initialize() +/obj/item/reagent_containers/food/snacks/crab_legs/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 6) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -1114,7 +1114,7 @@ center_of_mass_y = 13 bitesize = 3 -/obj/item/reagent_containers/food/snacks/fishfingers/Initialize() +/obj/item/reagent_containers/food/snacks/fishfingers/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 4) @@ -1127,7 +1127,7 @@ center_of_mass_y = 13 bitesize = 3 -/obj/item/reagent_containers/food/snacks/zestfish/Initialize() +/obj/item/reagent_containers/food/snacks/zestfish/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 4) @@ -1142,7 +1142,7 @@ nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2) bitesize = 6 -/obj/item/reagent_containers/food/snacks/mushroomslice/Initialize() +/obj/item/reagent_containers/food/snacks/mushroomslice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) @@ -1166,7 +1166,7 @@ center_of_mass_y = 10 bitesize = 3 -/obj/item/reagent_containers/food/snacks/bearmeat/Initialize() +/obj/item/reagent_containers/food/snacks/bearmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 12) reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) @@ -1180,7 +1180,7 @@ center_of_mass_y = 10 bitesize = 6 -/obj/item/reagent_containers/food/snacks/xenomeat/Initialize() +/obj/item/reagent_containers/food/snacks/xenomeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_PACID,6) @@ -1194,7 +1194,7 @@ center_of_mass_y = 10 bitesize = 6 -/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize() +/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6) reagents.remove_reagent(REAGENT_ID_PACID,6) @@ -1208,7 +1208,7 @@ center_of_mass_y = 16 bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatball/Initialize() +/obj/item/reagent_containers/food/snacks/meatball/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -1221,7 +1221,7 @@ center_of_mass_y = 16 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sausage/Initialize() +/obj/item/reagent_containers/food/snacks/sausage/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -1238,7 +1238,7 @@ var/warm = FALSE var/list/heated_reagents = list(REAGENT_ID_TRICORDRAZINE = 5) -/obj/item/reagent_containers/food/snacks/donkpocket/Initialize() +/obj/item/reagent_containers/food/snacks/donkpocket/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -1339,7 +1339,7 @@ center_of_mass_y = 11 bitesize = 2 -/obj/item/reagent_containers/food/snacks/brainburger/Initialize() +/obj/item/reagent_containers/food/snacks/brainburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_ALKYSINE, 6) @@ -1368,7 +1368,7 @@ center_of_mass_y = 11 bitesize = 2 -/obj/item/reagent_containers/food/snacks/human/burger/Initialize() +/obj/item/reagent_containers/food/snacks/human/burger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -1381,7 +1381,7 @@ nutriment_amt = 2 nutriment_desc = list(REAGENT_ID_CHEESE = 2, "bun" = 2) -/obj/item/reagent_containers/food/snacks/cheeseburger/Initialize() +/obj/item/reagent_containers/food/snacks/cheeseburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -1396,7 +1396,7 @@ nutriment_desc = list("bun" = 2) bitesize = 2 -/obj/item/reagent_containers/food/snacks/monkeyburger/Initialize() +/obj/item/reagent_containers/food/snacks/monkeyburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -1409,7 +1409,7 @@ center_of_mass_y = 10 bitesize = 3 -/obj/item/reagent_containers/food/snacks/fishburger/Initialize() +/obj/item/reagent_containers/food/snacks/fishburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -1454,7 +1454,7 @@ center_of_mass_y = 11 bitesize = 2 -/obj/item/reagent_containers/food/snacks/xenoburger/Initialize() +/obj/item/reagent_containers/food/snacks/xenoburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -1470,7 +1470,7 @@ bitesize = 2 // CHOMPedit begin - honkwork infection -/obj/item/reagent_containers/food/snacks/clownburger/Initialize() +/obj/item/reagent_containers/food/snacks/clownburger/Initialize(mapload) . = ..() reagents.add_reagent("protein", 2) // needed to call On_Consume()... Is this actually an issue? @@ -1503,7 +1503,7 @@ center_of_mass_y = 13 bitesize = 1 -/obj/item/reagent_containers/food/snacks/omelette/Initialize() +/obj/item/reagent_containers/food/snacks/omelette/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -1531,7 +1531,7 @@ nutriment_desc = list("pie" = 3, REAGENT_ID_CREAM = 2) bitesize = 3 -/obj/item/reagent_containers/food/snacks/pie/Initialize() +/obj/item/reagent_containers/food/snacks/pie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BANANA,5) @@ -1552,11 +1552,11 @@ nutriment_desc = list("sweetness" = 2, "pie" = 3) bitesize = 3 -/obj/item/reagent_containers/food/snacks/berryclafoutis/berry/Initialize() +/obj/item/reagent_containers/food/snacks/berryclafoutis/berry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) -/obj/item/reagent_containers/food/snacks/berryclafoutis/poison/Initialize() +/obj/item/reagent_containers/food/snacks/berryclafoutis/poison/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 5) @@ -1594,7 +1594,7 @@ center_of_mass_y = 11 bitesize = 2 -/obj/item/reagent_containers/food/snacks/soylentgreen/Initialize() +/obj/item/reagent_containers/food/snacks/soylentgreen/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -1620,7 +1620,7 @@ center_of_mass_y = 13 bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatpie/Initialize() +/obj/item/reagent_containers/food/snacks/meatpie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -1647,7 +1647,7 @@ nutriment_desc = list("sweetness" = 3, PLANT_MUSHROOMS = 3, "pie" = 2) bitesize = 3 -/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize() +/obj/item/reagent_containers/food/snacks/amanita_pie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_AMATOXIN, 3) reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1) @@ -1663,7 +1663,7 @@ nutriment_desc = list("heartiness" = 2, PLANT_MUSHROOMS = 3, "pie" = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/plump_pie/Initialize() +/obj/item/reagent_containers/food/snacks/plump_pie/Initialize(mapload) . = ..() if(prob(10)) name = "exceptional plump pie" @@ -1681,7 +1681,7 @@ center_of_mass_y = 13 bitesize = 2 -/obj/item/reagent_containers/food/snacks/xemeatpie/Initialize() +/obj/item/reagent_containers/food/snacks/xemeatpie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -1695,7 +1695,7 @@ center_of_mass_y = 9 bitesize = 2 -/obj/item/reagent_containers/food/snacks/wingfangchu/Initialize() +/obj/item/reagent_containers/food/snacks/wingfangchu/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -1709,7 +1709,7 @@ center_of_mass_y = 15 bitesize = 2 -/obj/item/reagent_containers/food/snacks/human/kabob/Initialize() +/obj/item/reagent_containers/food/snacks/human/kabob/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -1723,7 +1723,7 @@ center_of_mass_y = 15 bitesize = 2 -/obj/item/reagent_containers/food/snacks/monkeykabob/Initialize() +/obj/item/reagent_containers/food/snacks/monkeykabob/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -1751,7 +1751,7 @@ nutriment_desc = list("toasted bread" = 3) bitesize = 3 -/obj/item/reagent_containers/food/snacks/cubancarp/Initialize() +/obj/item/reagent_containers/food/snacks/cubancarp/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) @@ -1771,7 +1771,7 @@ bitesize = 0.1 //This snack is supposed to be eaten for a long time. -/obj/item/reagent_containers/food/snacks/popcorn/Initialize() +/obj/item/reagent_containers/food/snacks/popcorn/Initialize(mapload) . = ..() unpopped = rand(1,10) @@ -1798,7 +1798,7 @@ nutriment_desc = list("fries" = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/fries/Initialize() +/obj/item/reagent_containers/food/snacks/fries/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_OIL, 1.2)//This is mainly for the benefit of adminspawning @@ -1849,7 +1849,7 @@ nutriment_desc = list(PLANT_CARROT = 3, "salt" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/carrotfries/Initialize() +/obj/item/reagent_containers/food/snacks/carrotfries/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 3) @@ -1866,7 +1866,7 @@ nutriment_desc = list("fresh fries" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheesyfries/Initialize() +/obj/item/reagent_containers/food/snacks/cheesyfries/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -1883,7 +1883,7 @@ center_of_mass_y = 11 bitesize = 4 -/obj/item/reagent_containers/food/snacks/chilicheesefries/Initialize() +/obj/item/reagent_containers/food/snacks/chilicheesefries/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) @@ -1897,7 +1897,7 @@ center_of_mass_y = 7 bitesize = 3 -/obj/item/reagent_containers/food/snacks/blackpudding/Initialize() +/obj/item/reagent_containers/food/snacks/blackpudding/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_BLOOD, 5) @@ -1934,7 +1934,7 @@ center_of_mass_y = 12 bitesize = 2 -/obj/item/reagent_containers/food/snacks/badrecipe/Initialize() +/obj/item/reagent_containers/food/snacks/badrecipe/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SALMONELLA, 1) reagents.add_reagent(REAGENT_ID_CARBON, 3) @@ -1949,7 +1949,7 @@ center_of_mass_y = 13 bitesize = 3 -/obj/item/reagent_containers/food/snacks/meatsteak/Initialize() +/obj/item/reagent_containers/food/snacks/meatsteak/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -1967,7 +1967,7 @@ nutriment_desc = list(PLANT_MUSHROOMS = 6) bitesize = 3 -/obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize() +/obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 6) @@ -1983,7 +1983,7 @@ nutriment_desc = list("jelly" = 3, PLANT_MUSHROOMS = 3) bitesize = 3 -/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize() +/obj/item/reagent_containers/food/snacks/amanitajelly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_AMATOXIN, 6) reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) @@ -2013,7 +2013,7 @@ var/wrapped = 0 var/monkey_type = "Monkey" -/obj/item/reagent_containers/food/snacks/monkeycube/Initialize() +/obj/item/reagent_containers/food/snacks/monkeycube/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -2122,7 +2122,7 @@ nutriment_desc = list("buns" = 4) bitesize = 3 -/obj/item/reagent_containers/food/snacks/bigbiteburger/Initialize() +/obj/item/reagent_containers/food/snacks/bigbiteburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -2138,7 +2138,7 @@ nutriment_desc = list("tortilla" = 3, PLANT_CORN = 3) bitesize = 4 -/obj/item/reagent_containers/food/snacks/enchiladas/Initialize() +/obj/item/reagent_containers/food/snacks/enchiladas/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 6) @@ -2153,7 +2153,7 @@ center_of_mass_y = 13 bitesize = 6 -/obj/item/reagent_containers/food/snacks/monkeysdelight/Initialize() +/obj/item/reagent_containers/food/snacks/monkeysdelight/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) reagents.add_reagent(REAGENT_ID_BANANA, 5) @@ -2171,7 +2171,7 @@ nutriment_desc = list("french bread" = 6) bitesize = 3 -/obj/item/reagent_containers/food/snacks/baguette/Initialize() +/obj/item/reagent_containers/food/snacks/baguette/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -2187,7 +2187,7 @@ nutriment_desc = list("salt" = 1, "chips" = 3) bitesize = 3 -/obj/item/reagent_containers/food/snacks/fishandchips/Initialize() +/obj/item/reagent_containers/food/snacks/fishandchips/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -2203,7 +2203,7 @@ nutriment_desc = list("waffle" = 7, "sweetness" = 1) bitesize = 4 -/obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize() +/obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 8) @@ -2218,11 +2218,11 @@ nutriment_desc = list("toasted bread" = 2) bitesize = 3 -/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry/Initialize() +/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) -/obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize() +/obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) @@ -2259,11 +2259,11 @@ nutriment_desc = list("buns" = 5) bitesize = 2 -/obj/item/reagent_containers/food/snacks/jellyburger/slime/Initialize() +/obj/item/reagent_containers/food/snacks/jellyburger/slime/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) -/obj/item/reagent_containers/food/snacks/jellyburger/cherry/Initialize() +/obj/item/reagent_containers/food/snacks/jellyburger/cherry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) @@ -2326,7 +2326,7 @@ nutriment_desc = list(REAGENT_ID_RICE = 2, "gauze" = 4, "fish" = 10) bitesize = 2 -/obj/item/reagent_containers/food/snacks/kudzudonburi/Initialize() +/obj/item/reagent_containers/food/snacks/kudzudonburi/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -2342,7 +2342,7 @@ nutriment_desc = list(PLANT_TOMATO = 3, "noodles" = 3) bitesize = 4 -/obj/item/reagent_containers/food/snacks/pastatomato/Initialize() +/obj/item/reagent_containers/food/snacks/pastatomato/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 10) @@ -2358,7 +2358,7 @@ nutriment_desc = list("noodles" = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatballspagetti/Initialize() +/obj/item/reagent_containers/food/snacks/meatballspagetti/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -2373,7 +2373,7 @@ nutriment_desc = list("noodles" = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/spesslaw/Initialize() +/obj/item/reagent_containers/food/snacks/spesslaw/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -2388,7 +2388,7 @@ nutriment_desc = list("buns" = 25) bitesize = 10 -/obj/item/reagent_containers/food/snacks/superbiteburger/Initialize() +/obj/item/reagent_containers/food/snacks/superbiteburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 25) @@ -2463,7 +2463,7 @@ nutriment_desc = list("bread" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/sandwich/Initialize() +/obj/item/reagent_containers/food/snacks/sandwich/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -2487,7 +2487,7 @@ nutriment_desc = list("toasted bread" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize() +/obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_CARBON, 2) @@ -2501,7 +2501,7 @@ nutriment_desc = list("toasted bread" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/grilledcheese/Initialize() +/obj/item/reagent_containers/food/snacks/grilledcheese/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -2516,11 +2516,11 @@ nutriment_desc = list("bread" = 2) bitesize = 3 -/obj/item/reagent_containers/food/snacks/jellysandwich/slime/Initialize() +/obj/item/reagent_containers/food/snacks/jellysandwich/slime/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) -/obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize() +/obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) @@ -2528,7 +2528,7 @@ desc = "You wish you had some peanut butter to go with this... Oh wait!" icon_state = "pbandj" -/obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter/Initialize() +/obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PEANUTBUTTER, 5) @@ -2540,7 +2540,7 @@ icon_state = "boiledslimecore" bitesize = 3 -/obj/item/reagent_containers/food/snacks/boiledslimecore/Initialize() +/obj/item/reagent_containers/food/snacks/boiledslimecore/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) @@ -2555,7 +2555,7 @@ nutriment_desc = list(PLANT_MUSHROOMS = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize() +/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize(mapload) . = ..() if(prob(10)) name = "exceptional plump helmet biscuit" @@ -2572,7 +2572,7 @@ center_of_mass_y = 10 bitesize = 1 -/obj/item/reagent_containers/food/snacks/chawanmushi/Initialize() +/obj/item/reagent_containers/food/snacks/chawanmushi/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 5) @@ -2600,7 +2600,7 @@ nutriment_desc = list("100% real salad") bitesize = 3 -/obj/item/reagent_containers/food/snacks/validsalad/Initialize() +/obj/item/reagent_containers/food/snacks/validsalad/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -2616,7 +2616,7 @@ nutriment_desc = list(PLANT_APPLE = 8) bitesize = 3 -/obj/item/reagent_containers/food/snacks/appletart/Initialize() +/obj/item/reagent_containers/food/snacks/appletart/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GOLD, 5) @@ -2635,7 +2635,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/meatballsoup/Initialize() +/obj/item/reagent_containers/food/snacks/meatballsoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -2648,7 +2648,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/slimesoup/Initialize() +/obj/item/reagent_containers/food/snacks/slimesoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) @@ -2663,7 +2663,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/bloodsoup/Initialize() +/obj/item/reagent_containers/food/snacks/bloodsoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_BLOOD, 10) @@ -2681,7 +2681,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/clownstears/Initialize() +/obj/item/reagent_containers/food/snacks/clownstears/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BANANA, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) @@ -2698,7 +2698,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/vegetablesoup/Initialize() +/obj/item/reagent_containers/food/snacks/vegetablesoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_VEGETABLESOUP, 10) @@ -2715,7 +2715,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/nettlesoup/Initialize() +/obj/item/reagent_containers/food/snacks/nettlesoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 5) reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5) @@ -2733,7 +2733,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/mysterysoup/Initialize() +/obj/item/reagent_containers/food/snacks/mysterysoup/Initialize(mapload) . = ..() var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10) switch(mysteryselect) @@ -2783,7 +2783,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/wishsoup/Initialize() +/obj/item/reagent_containers/food/snacks/wishsoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 10) if(prob(25)) @@ -2801,7 +2801,7 @@ bitesize = 3 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/tomatosoup/Initialize() +/obj/item/reagent_containers/food/snacks/tomatosoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 10) @@ -2816,7 +2816,7 @@ bitesize = 3 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/mushroomsoup/Initialize() +/obj/item/reagent_containers/food/snacks/mushroomsoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MUSHROOMSOUP, 10) @@ -2831,7 +2831,7 @@ bitesize = 3 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/beetsoup/Initialize() +/obj/item/reagent_containers/food/snacks/beetsoup/Initialize(mapload) . = ..() name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht")) reagents.add_reagent(REAGENT_ID_BEETSOUP, 10) @@ -2847,7 +2847,7 @@ bitesize = 3 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/soup/onion/Initialize() +/obj/item/reagent_containers/food/snacks/soup/onion/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10) @@ -2859,7 +2859,7 @@ filling_color = "#ead90c" bitesize = 5 -/obj/item/reagent_containers/food/snacks/chickennoodlesoup/Initialize() +/obj/item/reagent_containers/food/snacks/chickennoodlesoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHICKENNOODLESOUP, 10) @@ -2877,7 +2877,7 @@ bitesize = 10 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/stew/Initialize() +/obj/item/reagent_containers/food/snacks/stew/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5) @@ -2897,7 +2897,7 @@ bitesize = 6 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/bearstew/Initialize() +/obj/item/reagent_containers/food/snacks/bearstew/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) @@ -2919,7 +2919,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/hotchili/Initialize() +/obj/item/reagent_containers/food/snacks/hotchili/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) @@ -2938,7 +2938,7 @@ bitesize = 5 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/coldchili/Initialize() +/obj/item/reagent_containers/food/snacks/coldchili/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_FROSTOIL, 3) @@ -2959,7 +2959,7 @@ bitesize = 6 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/bearchili/Initialize() +/obj/item/reagent_containers/food/snacks/bearchili/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) @@ -2996,7 +2996,7 @@ * whole item, transferring the reagents and deleting the whole item, which may * have performance implications. */ -/obj/item/reagent_containers/food/snacks/slice/Initialize() +/obj/item/reagent_containers/food/snacks/slice/Initialize(mapload) . = ..() if(filled) var/obj/item/reagent_containers/food/snacks/whole = new whole_path() @@ -3019,7 +3019,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/meatbread/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/meatbread/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 20) @@ -3050,7 +3050,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 20) @@ -3081,7 +3081,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/bananabread/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/bananabread/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BANANA, 20) @@ -3152,7 +3152,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 15) @@ -3182,7 +3182,7 @@ nutriment_amt = 25 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/carrotcake/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/carrotcake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 10) @@ -3213,7 +3213,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/braincake/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/braincake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 25) reagents.add_reagent(REAGENT_ID_ALKYSINE, 10) @@ -3245,7 +3245,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cheesecake/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/cheesecake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 15) @@ -3276,7 +3276,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/peanutcake/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/peanutcake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 5) @@ -3438,7 +3438,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/cheesewheel/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -3464,7 +3464,7 @@ nutriment_amt = 20 bitesize = 3 -/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPRINKLES, 10) @@ -3575,7 +3575,7 @@ slices_num = 6 trash = /obj/item/trash/snacktray -/obj/item/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 12) @@ -3597,7 +3597,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -3627,7 +3627,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/snacks/sliceable/quiche/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/quiche/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -3645,7 +3645,7 @@ /obj/item/reagent_containers/food/snacks/quicheslice/filled nutriment_amt = 1 -/obj/item/reagent_containers/food/snacks/quicheslice/filled/Initialize() +/obj/item/reagent_containers/food/snacks/quicheslice/filled/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -3664,7 +3664,7 @@ center_of_mass_y = 9 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/brownies/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/brownies/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -3682,7 +3682,7 @@ /obj/item/reagent_containers/food/snacks/browniesslice/filled nutriment_amt = 1 -/obj/item/reagent_containers/food/snacks/browniesslice/filled/Initialize() +/obj/item/reagent_containers/food/snacks/browniesslice/filled/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -3701,7 +3701,7 @@ center_of_mass_y = 9 bitesize = 3 -/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2) @@ -3723,7 +3723,7 @@ /obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled nutriment_amt = 1 -/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize() +/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -3735,7 +3735,7 @@ nutriment_amt = 5 nutriment_desc = list(PLANT_TOMATO = 4, "meat" = 2) -/obj/item/reagent_containers/food/snacks/lasagna/Initialize() +/obj/item/reagent_containers/food/snacks/lasagna/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) //For meaty things. @@ -3771,7 +3771,7 @@ bitesize = 3 trash = /obj/item/trash/tray -/obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 9) reagents.add_reagent(REAGENT_ID_COCO, 5) @@ -3798,7 +3798,7 @@ bitesize = 5 trash = /obj/item/trash/tray -/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -3828,7 +3828,7 @@ var/list/extra_product = list(/obj/item/reagent_containers/food/snacks/turkeydrumstick = 2, /obj/item/trash/turkeybones = 1) -/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -3869,7 +3869,7 @@ bitesize = 12 w_class = 2 -/obj/item/reagent_containers/food/snacks/sliceable/suppermatter/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/suppermatter/Initialize(mapload) . = ..() set_light(1.4,2,"#FFFF00") @@ -3881,7 +3881,7 @@ bitesize = 3 trash = null -/obj/item/reagent_containers/food/snacks/suppermattershard/Initialize() +/obj/item/reagent_containers/food/snacks/suppermattershard/Initialize(mapload) . = ..() set_light(1.4,1.4,"#FFFF00") @@ -3897,7 +3897,7 @@ bitesize = 12 w_class = 2 -/obj/item/reagent_containers/food/snacks/sliceable/excitingsuppermatter/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/excitingsuppermatter/Initialize(mapload) . = ..() set_light(1.4,2,"#FF0000") @@ -3909,7 +3909,7 @@ bitesize = 4 trash = null -/obj/item/reagent_containers/food/snacks/excitingsuppermattershard/Initialize() +/obj/item/reagent_containers/food/snacks/excitingsuppermattershard/Initialize(mapload) . = ..() set_light(1.4,1.4,"#FF0000") @@ -3931,7 +3931,7 @@ nutriment_amt = 35 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 5) reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) @@ -3961,7 +3961,7 @@ nutriment_amt = 30 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_CHEESE, 5) @@ -3992,7 +3992,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 34) reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) @@ -4022,7 +4022,7 @@ nutriment_amt = 35 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 5) @@ -4051,7 +4051,7 @@ nutriment_amt = 25 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 5) reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) @@ -4103,7 +4103,7 @@ nutriment_amt = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 5) reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) @@ -4281,32 +4281,32 @@ return . = ..() -/obj/item/pizzabox/margherita/Initialize() +/obj/item/pizzabox/margherita/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita(src) boxtag = "Margherita Deluxe" . = ..() -/obj/item/pizzabox/vegetable/Initialize() +/obj/item/pizzabox/vegetable/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src) boxtag = "Gourmet Vegatable" . = ..() -/obj/item/pizzabox/mushroom/Initialize() +/obj/item/pizzabox/mushroom/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src) boxtag = "Mushroom Special" . = ..() -/obj/item/pizzabox/meat/Initialize() +/obj/item/pizzabox/meat/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src) boxtag = "Meatlover's Supreme" . = ..() -/obj/item/pizzabox/pineapple/Initialize() +/obj/item/pizzabox/pineapple/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple(src) boxtag = "Hawaiian Sunrise" . = ..() -/obj/item/pizzabox/old/Initialize() +/obj/item/pizzabox/old/Initialize(mapload) pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza(src) boxtag = "Deluxe Gourmet" . = ..() @@ -4323,7 +4323,7 @@ nutriment_desc = list("a chorus of flavor" = 6) bitesize = 2 -/obj/item/reagent_containers/food/snacks/dionaroast/Initialize() +/obj/item/reagent_containers/food/snacks/dionaroast/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_RADIUM, 2) @@ -4338,7 +4338,7 @@ nutriment_amt = 3 nutriment_desc = list("uncooked dough" = 3) -/obj/item/reagent_containers/food/snacks/dough/Initialize() +/obj/item/reagent_containers/food/snacks/dough/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -4362,7 +4362,7 @@ center_of_mass_x = 16 center_of_mass_y = 16 -/obj/item/reagent_containers/food/snacks/sliceable/flatdough/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/flatdough/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -4454,7 +4454,7 @@ nutriment_amt = 4 nutriment_desc = list(REAGENT_ID_CHEESE = 2,"taco shell" = 2) -/obj/item/reagent_containers/food/snacks/taco/Initialize() +/obj/item/reagent_containers/food/snacks/taco/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -4467,7 +4467,7 @@ center_of_mass_x = 17 center_of_mass_y = 20 -/obj/item/reagent_containers/food/snacks/rawcutlet/Initialize() +/obj/item/reagent_containers/food/snacks/rawcutlet/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -4480,7 +4480,7 @@ center_of_mass_x = 17 center_of_mass_y = 20 -/obj/item/reagent_containers/food/snacks/cutlet/Initialize() +/obj/item/reagent_containers/food/snacks/cutlet/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -4493,7 +4493,7 @@ center_of_mass_x = 16 center_of_mass_y = 15 -/obj/item/reagent_containers/food/snacks/rawmeatball/Initialize() +/obj/item/reagent_containers/food/snacks/rawmeatball/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -4505,7 +4505,7 @@ center_of_mass_x = 16 center_of_mass_y = 17 -/obj/item/reagent_containers/food/snacks/hotdog/Initialize() +/obj/item/reagent_containers/food/snacks/hotdog/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -4513,7 +4513,7 @@ // name = "old hotdog" // desc = "Covered in mold. You're not gonna eat that, are you?" // -///obj/item/reagent_containers/food/snacks/hotdog/old/Initialize() +///obj/item/reagent_containers/food/snacks/hotdog/old/Initialize(mapload) // . = ..() // reagents.add_reagent(REAGENT_ID_MOLD, 6) @@ -4574,7 +4574,7 @@ catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle) filling_color = "#5dadcf" -/obj/item/reagent_containers/food/snacks/frostbelle/Initialize() +/obj/item/reagent_containers/food/snacks/frostbelle/Initialize(mapload) . = ..() set_light(1, 1, "#5dadcf") @@ -4592,7 +4592,7 @@ do_coating_prefix = 0 bitesize = 2 -/obj/item/reagent_containers/food/snacks/bellefritter/Initialize() +/obj/item/reagent_containers/food/snacks/bellefritter/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BATTER, 10) reagents.add_reagent(REAGENT_ID_SUGAR, 5) @@ -4634,7 +4634,7 @@ bitesize = 4 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/liquidfood/Initialize() +/obj/item/reagent_containers/food/snacks/liquidfood/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_IRON, 3) @@ -4650,7 +4650,7 @@ bitesize = 4 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/liquidprotein/Initialize() +/obj/item/reagent_containers/food/snacks/liquidprotein/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 30) reagents.add_reagent(REAGENT_ID_IRON, 3) @@ -4667,7 +4667,7 @@ bitesize = 4 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/liquidvitamin/Initialize() +/obj/item/reagent_containers/food/snacks/liquidvitamin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FLOUR, 20) reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5) @@ -4684,7 +4684,7 @@ center_of_mass_y = 16 bitesize = 3 -/obj/item/reagent_containers/food/snacks/meatcube/Initialize() +/obj/item/reagent_containers/food/snacks/meatcube/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 15) @@ -4730,7 +4730,7 @@ pickup_sound = 'sound/items/pickup/soda.ogg' bitesize = 2 -/obj/item/reagent_containers/food/snacks/unajerky/Initialize() +/obj/item/reagent_containers/food/snacks/unajerky/Initialize(mapload) . =..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) @@ -4743,7 +4743,7 @@ nutriment_amt = 6 bitesize = 3 -/obj/item/reagent_containers/food/snacks/sashimi/Initialize() +/obj/item/reagent_containers/food/snacks/sashimi/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -4756,7 +4756,7 @@ nutriment_desc = list("bread" = 2, "bacon" = 2, REAGENT_ID_EGG = 2) bitesize = 2 -/obj/item/reagent_containers/food/snacks/benedict/Initialize() +/obj/item/reagent_containers/food/snacks/benedict/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -4767,7 +4767,7 @@ icon_state = "bakedbeans" bitesize = 2 -/obj/item/reagent_containers/food/snacks/beans/Initialize() +/obj/item/reagent_containers/food/snacks/beans/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 6) @@ -4811,11 +4811,11 @@ nutriment_desc = list("sweetness" = 2, "muffin" = 2, PLANT_BERRIES = 2) bitesize = 2 -/obj/item/reagent_containers/food/snacks/berrymuffin/berry/Initialize() +/obj/item/reagent_containers/food/snacks/berrymuffin/berry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3) -/obj/item/reagent_containers/food/snacks/berrymuffin/poison/Initialize() +/obj/item/reagent_containers/food/snacks/berrymuffin/poison/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 3) @@ -4830,11 +4830,11 @@ nutriment_desc = list("spookiness" = 4, "muffin" = 1, PLANT_BERRIES = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/ghostmuffin/berry/Initialize() +/obj/item/reagent_containers/food/snacks/ghostmuffin/berry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3) -/obj/item/reagent_containers/food/snacks/ghostmuffin/poison/Initialize() +/obj/item/reagent_containers/food/snacks/ghostmuffin/poison/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 3) @@ -4849,7 +4849,7 @@ nutriment_desc = list(REAGENT_ID_EGG = 4, PLANT_CHILI = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/devilledegg/Initialize() +/obj/item/reagent_containers/food/snacks/devilledegg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) @@ -4880,7 +4880,7 @@ nutriment_desc = list("bittersweet" = 10, REAGENT_ID_IRON = 5) bitesize = 4 -/obj/item/reagent_containers/food/snacks/rosesalad/Initialize() +/obj/item/reagent_containers/food/snacks/rosesalad/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_STOXIN, 2) @@ -4894,7 +4894,7 @@ nutriment_desc = list(REAGENT_ID_RICE = 2, REAGENT_ID_EGG = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/eggbowl/Initialize() +/obj/item/reagent_containers/food/snacks/eggbowl/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -4914,7 +4914,7 @@ nutriment_desc = list("salt" = 1, REAGENT_ID_CHEESE = 2, "chili peppers" = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cubannachos/Initialize() +/obj/item/reagent_containers/food/snacks/cubannachos/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) @@ -4926,7 +4926,7 @@ nutriment_desc = list("salt" = 1, REAGENT_ID_RICE = 2, "chili peppers" = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/curryrice/Initialize() +/obj/item/reagent_containers/food/snacks/curryrice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) @@ -4938,7 +4938,7 @@ nutriment_desc = list("meat" = 3, "pastry" = 3) bitesize = 3 -/obj/item/reagent_containers/food/snacks/piginblanket/Initialize() +/obj/item/reagent_containers/food/snacks/piginblanket/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -4951,7 +4951,7 @@ w_class = ITEMSIZE_TINY bitesize = 5 -/obj/item/reagent_containers/food/snacks/wormsickly/Initialize() +/obj/item/reagent_containers/food/snacks/wormsickly/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FISHBAIT, 9) reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -4965,7 +4965,7 @@ w_class = ITEMSIZE_TINY bitesize = 5 -/obj/item/reagent_containers/food/snacks/worm/Initialize() +/obj/item/reagent_containers/food/snacks/worm/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FISHBAIT, 15) reagents.add_reagent(REAGENT_ID_PROTEIN, 5) @@ -4979,7 +4979,7 @@ w_class = ITEMSIZE_TINY bitesize = 5 -/obj/item/reagent_containers/food/snacks/wormdeluxe/Initialize() +/obj/item/reagent_containers/food/snacks/wormdeluxe/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FISHBAIT, 30) reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -4993,7 +4993,7 @@ nutriment_desc = list("tart" = 1) w_class = ITEMSIZE_TINY -/obj/item/reagent_containers/food/snacks/siffruit/Initialize() +/obj/item/reagent_containers/food/snacks/siffruit/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SIFSAP, 2) @@ -5031,7 +5031,7 @@ nutriment_desc = list("bread" = 4, REAGENT_ID_CHEESE = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/bagelcheese/Initialize() +/obj/item/reagent_containers/food/snacks/bagelcheese/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -5059,7 +5059,7 @@ nutriment_desc = list("life" = 1, "death" = 1, "entropy" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/bageleverything/Initialize() +/obj/item/reagent_containers/food/snacks/bageleverything/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PHORON, 5) reagents.add_reagent(REAGENT_ID_DEFECTIVENANITES, 5) @@ -5069,7 +5069,7 @@ desc = "Noo! ...Two bagels!" icon_state = "bagelplain" -/obj/item/reagent_containers/food/snacks/bageltwo/Initialize() +/obj/item/reagent_containers/food/snacks/bageltwo/Initialize(mapload) ..() spawn_bagels() spawn_bagels() @@ -5256,7 +5256,7 @@ bitesize = 2 -/obj/item/reagent_containers/food/snacks/sausage/battered/Initialize() +/obj/item/reagent_containers/food/snacks/sausage/battered/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_BATTER, 1.7) @@ -5274,7 +5274,7 @@ nutriment_desc = list("chilli pepper" = 2) bitesize = 1 -/obj/item/reagent_containers/food/snacks/jalapeno_poppers/Initialize() +/obj/item/reagent_containers/food/snacks/jalapeno_poppers/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BATTER, 2) reagents.add_reagent(REAGENT_ID_OIL, 2) @@ -5287,7 +5287,7 @@ center_of_mass_y = 11 bitesize = 2 -/obj/item/reagent_containers/food/snacks/mouseburger/Initialize() +/obj/item/reagent_containers/food/snacks/mouseburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -5302,14 +5302,14 @@ do_coating_prefix = 0 bitesize = 1.5 -/obj/item/reagent_containers/food/snacks/chickenkatsu/Initialize() +/obj/item/reagent_containers/food/snacks/chickenkatsu/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_BEERBATTER, 2) reagents.add_reagent(REAGENT_ID_OIL, 1) -/obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BATTER, 6.5) coating = reagents.get_reagent(REAGENT_ID_BATTER) @@ -5325,7 +5325,7 @@ do_coating_prefix = 0 bitesize = 2 -/obj/item/reagent_containers/food/snacks/funnelcake/Initialize() +/obj/item/reagent_containers/food/snacks/funnelcake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BATTER, 10) reagents.add_reagent(REAGENT_ID_SUGAR, 5) @@ -5349,7 +5349,7 @@ nutriment_desc = list("butter" = 1) nutriment_amt = 0 -/obj/item/reagent_containers/food/snacks/spreads/Initialize() +/obj/item/reagent_containers/food/snacks/spreads/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 20) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE,1) @@ -5371,7 +5371,7 @@ center_of_mass_x = 16 center_of_mass_y = 16 -/obj/item/reagent_containers/food/snacks/rawbacon/Initialize() +/obj/item/reagent_containers/food/snacks/rawbacon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 0.33) @@ -5399,7 +5399,7 @@ center_of_mass_x = 16 center_of_mass_y = 16 -/obj/item/reagent_containers/food/snacks/bacon/Initialize() +/obj/item/reagent_containers/food/snacks/bacon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 0.33) reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 1) @@ -5410,7 +5410,7 @@ icon_state = "bacon_stick" trash = /obj/item/trash/stick -/obj/item/reagent_containers/food/snacks/bacon_stick/Initialize() +/obj/item/reagent_containers/food/snacks/bacon_stick/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_EGG, 1) @@ -5421,7 +5421,7 @@ icon_state = "chilied_eggs" trash = /obj/item/trash/snack_bowl -/obj/item/reagent_containers/food/snacks/chilied_eggs/Initialize() +/obj/item/reagent_containers/food/snacks/chilied_eggs/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_EGG, 6) reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -5432,7 +5432,7 @@ icon_state = "bacon_and_eggs" trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/bacon_and_eggs/Initialize() +/obj/item/reagent_containers/food/snacks/bacon_and_eggs/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_EGG, 1) @@ -5445,7 +5445,7 @@ nutriment_amt = 6 trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/sweet_and_sour/Initialize() +/obj/item/reagent_containers/food/snacks/sweet_and_sour/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -5457,7 +5457,7 @@ nutriment_desc = list("corn batter" = 4) nutriment_amt = 4 -/obj/item/reagent_containers/food/snacks/corn_dog/Initialize() +/obj/item/reagent_containers/food/snacks/corn_dog/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -5468,7 +5468,7 @@ nutriment_amt = 0 bitesize = 4 -/obj/item/reagent_containers/food/snacks/truffle/Initialize() +/obj/item/reagent_containers/food/snacks/truffle/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COCO, 6) @@ -5476,7 +5476,7 @@ name = "mystery chocolate truffle" desc = "Rich bite-sized chocolate with a mystery filling!" -/obj/item/reagent_containers/food/snacks/truffle/random/Initialize() +/obj/item/reagent_containers/food/snacks/truffle/random/Initialize(mapload) . = ..() var/reagent_string = pick(list(REAGENT_ID_CREAM,REAGENT_ID_CHERRYJELLY,REAGENT_ID_MINT,REAGENT_ID_FROSTOIL,REAGENT_ID_CAPSAICIN,REAGENT_ID_CREAM,REAGENT_ID_COFFEE,REAGENT_ID_MILKSHAKE)) reagents.add_reagent(reagent_string, 4) @@ -5488,7 +5488,7 @@ nutriment_desc = list("flatbread" = 5) nutriment_amt = 5 -/obj/item/reagent_containers/food/snacks/bacon_flatbread/Initialize() +/obj/item/reagent_containers/food/snacks/bacon_flatbread/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 5) @@ -5499,7 +5499,7 @@ nutriment_desc = list("flatbread" = 3) nutriment_amt = 3 -/obj/item/reagent_containers/food/snacks/meat_pocket/Initialize() +/obj/item/reagent_containers/food/snacks/meat_pocket/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -5510,7 +5510,7 @@ nutriment_desc = list("flatbread" = 3) nutriment_amt = 3 -/obj/item/reagent_containers/food/snacks/fish_taco/Initialize() +/obj/item/reagent_containers/food/snacks/fish_taco/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD,3) @@ -5521,7 +5521,7 @@ nutriment_desc = list("biscuit" = 3) nutriment_amt = 3 -/obj/item/reagent_containers/food/snacks/nt_muffin/Initialize() +/obj/item/reagent_containers/food/snacks/nt_muffin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN,5) @@ -5532,7 +5532,7 @@ nutriment_desc = list("sweetness" = 2) nutriment_amt = 2 -/obj/item/reagent_containers/food/snacks/pineapple_ring/Initialize() +/obj/item/reagent_containers/food/snacks/pineapple_ring/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PINEAPPLEJUICE,3) @@ -5548,7 +5548,7 @@ nutriment_amt = 3 bitesize = 2 -/obj/item/reagent_containers/food/snacks/burger/bacon/Initialize() +/obj/item/reagent_containers/food/snacks/burger/bacon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -5563,7 +5563,7 @@ nutriment_amt = 4 bitesize = 2 -/obj/item/reagent_containers/food/snacks/blt/Initialize() +/obj/item/reagent_containers/food/snacks/blt/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -5575,7 +5575,7 @@ filling_color = "#FFFBDB" bitesize = 2 -/obj/item/reagent_containers/food/snacks/porkbowl/Initialize() +/obj/item/reagent_containers/food/snacks/porkbowl/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_RICE, 6) reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -5603,7 +5603,7 @@ nutriment_desc = list("baked potato" = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/loadedbakedpotato/Initialize() +/obj/item/reagent_containers/food/snacks/loadedbakedpotato/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -5619,7 +5619,7 @@ nutriment_desc = list("fluffy potato" = 3, "sausage" = 2) bitesize = 4 -/obj/item/reagent_containers/food/snacks/bangersandmash/Initialize() +/obj/item/reagent_containers/food/snacks/bangersandmash/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -5635,7 +5635,7 @@ nutriment_desc = list("cheesy potato" = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheesymash/Initialize() +/obj/item/reagent_containers/food/snacks/cheesymash/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -5675,7 +5675,7 @@ icon_state = "nugget_lump" bitesize = 3 -/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]." @@ -5700,7 +5700,7 @@ nutriment_amt = 3 bitesize = 3 -/obj/item/reagent_containers/food/snacks/honeybun/Initialize() +/obj/item/reagent_containers/food/snacks/honeybun/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HONEY, 3) @@ -5964,7 +5964,7 @@ nutriment_desc = list("chilli peppers" = 5, "tortilla" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/fuegoburrito/Initialize() +/obj/item/reagent_containers/food/snacks/fuegoburrito/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) @@ -5976,7 +5976,7 @@ nutriment_desc = list("tortilla" = 3, "meat" = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatburrito/Initialize() +/obj/item/reagent_containers/food/snacks/meatburrito/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -5988,7 +5988,7 @@ nutriment_desc = list("tortilla" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/cheeseburrito/Initialize() +/obj/item/reagent_containers/food/snacks/cheeseburrito/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -6003,7 +6003,7 @@ nutriment_desc = list(REAGENT_ID_EGG = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/eggroll/Initialize() +/obj/item/reagent_containers/food/snacks/eggroll/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -6017,7 +6017,7 @@ nutriment_desc = list("tortilla" = 6) nutriment_amt = 6 -/obj/item/reagent_containers/food/snacks/burrito/Initialize() +/obj/item/reagent_containers/food/snacks/burrito/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -6031,7 +6031,7 @@ nutriment_desc = list("tortilla" = 6) nutriment_amt = 6 -/obj/item/reagent_containers/food/snacks/burrito_spicy/Initialize() +/obj/item/reagent_containers/food/snacks/burrito_spicy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -6045,7 +6045,7 @@ nutriment_desc = list("tortilla" = 6) nutriment_amt = 6 -/obj/item/reagent_containers/food/snacks/burrito_cheese/Initialize() +/obj/item/reagent_containers/food/snacks/burrito_cheese/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -6059,7 +6059,7 @@ nutriment_desc = list("tortilla" = 6) nutriment_amt = 6 -/obj/item/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize() +/obj/item/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -6073,7 +6073,7 @@ nutriment_desc = list("tortilla" = 6) nutriment_amt = 6 -/obj/item/reagent_containers/food/snacks/burrito_vegan/Initialize() +/obj/item/reagent_containers/food/snacks/burrito_vegan/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TOFU, 6) @@ -6107,7 +6107,7 @@ nutriment_desc = list("hellfire" = 6) nutriment_amt = 24// 10 Chilis is a lot. -/obj/item/reagent_containers/food/snacks/burrito_hell/Initialize() +/obj/item/reagent_containers/food/snacks/burrito_hell/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 9) reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 10) //what could possibly go wrong @@ -6120,7 +6120,7 @@ icon_state = "hatchling_suprise" trash = /obj/item/trash/snack_bowl -/obj/item/reagent_containers/food/snacks/hatchling_suprise/Initialize() +/obj/item/reagent_containers/food/snacks/hatchling_suprise/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_EGG, 2) reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -6131,7 +6131,7 @@ icon_state = "red_sun_special" trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/red_sun_special/Initialize() +/obj/item/reagent_containers/food/snacks/red_sun_special/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -6141,7 +6141,7 @@ icon_state = "riztizkzi_sea" trash = /obj/item/trash/snack_bowl -/obj/item/reagent_containers/food/snacks/riztizkzi_sea/Initialize() +/obj/item/reagent_containers/food/snacks/riztizkzi_sea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_EGG, 4) @@ -6151,7 +6151,7 @@ icon_state = "father_breakfast" trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/father_breakfast/Initialize() +/obj/item/reagent_containers/food/snacks/father_breakfast/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_EGG, 4) reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -6162,7 +6162,7 @@ icon_state = "stuffed_meatball" trash = /obj/item/trash/small_bowl -/obj/item/reagent_containers/food/snacks/stuffed_meatball/Initialize() +/obj/item/reagent_containers/food/snacks/stuffed_meatball/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -6172,7 +6172,7 @@ icon_state = "egg_pancake" trash = /obj/item/trash/plate -/obj/item/reagent_containers/food/snacks/egg_pancake/Initialize() +/obj/item/reagent_containers/food/snacks/egg_pancake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_EGG, 2) @@ -6190,7 +6190,7 @@ center_of_mass_y = 8 bitesize = 3 -/obj/item/reagent_containers/food/snacks/redcurry/Initialize() +/obj/item/reagent_containers/food/snacks/redcurry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 7) @@ -6207,7 +6207,7 @@ center_of_mass_y = 8 bitesize = 3 -/obj/item/reagent_containers/food/snacks/greencurry/Initialize() +/obj/item/reagent_containers/food/snacks/greencurry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) @@ -6225,7 +6225,7 @@ center_of_mass_y = 8 bitesize = 3 -/obj/item/reagent_containers/food/snacks/yellowcurry/Initialize() +/obj/item/reagent_containers/food/snacks/yellowcurry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -6238,7 +6238,7 @@ center_of_mass_y = 11 bitesize = 5 -/obj/item/reagent_containers/food/snacks/bearburger/Initialize() +/obj/item/reagent_containers/food/snacks/bearburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) //So spawned burgers will not be empty I guess? @@ -6254,7 +6254,7 @@ center_of_mass_y = 9 bitesize = 4 -/obj/item/reagent_containers/food/snacks/bibimbap/Initialize() +/obj/item/reagent_containers/food/snacks/bibimbap/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -6271,7 +6271,7 @@ center_of_mass_y = 10 bitesize = 2 -/obj/item/reagent_containers/food/snacks/lomein/Initialize() +/obj/item/reagent_containers/food/snacks/lomein/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -6299,7 +6299,7 @@ center_of_mass_y = 16 bitesize = 3 -/obj/item/reagent_containers/food/snacks/chickenfillet/Initialize() +/obj/item/reagent_containers/food/snacks/chickenfillet/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -6314,7 +6314,7 @@ center_of_mass_y = 11 bitesize = 5 -/obj/item/reagent_containers/food/snacks/friedmushroom/Initialize() +/obj/item/reagent_containers/food/snacks/friedmushroom/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -6331,7 +6331,7 @@ center_of_mass_y = 11 bitesize = 3 -/obj/item/reagent_containers/food/snacks/pisanggoreng/Initialize() +/obj/item/reagent_containers/food/snacks/pisanggoreng/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -6346,7 +6346,7 @@ center_of_mass_y = 11 bitesize = 2 -/obj/item/reagent_containers/food/snacks/meatbun/Initialize() +/obj/item/reagent_containers/food/snacks/meatbun/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -6361,7 +6361,7 @@ center_of_mass_y = 11 bitesize = 5 -/obj/item/reagent_containers/food/snacks/spicedmeatbun/Initialize() +/obj/item/reagent_containers/food/snacks/spicedmeatbun/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -6389,7 +6389,7 @@ center_of_mass_y = 9 bitesize = 3 -/obj/item/reagent_containers/food/snacks/chickenmomo/Initialize() +/obj/item/reagent_containers/food/snacks/chickenmomo/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) @@ -6406,7 +6406,7 @@ center_of_mass_y = 9 bitesize = 3 -/obj/item/reagent_containers/food/snacks/veggiemomo/Initialize() +/obj/item/reagent_containers/food/snacks/veggiemomo/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -6423,7 +6423,7 @@ center_of_mass_y = 9 bitesize = 2 -/obj/item/reagent_containers/food/snacks/risotto/Initialize() +/obj/item/reagent_containers/food/snacks/risotto/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -6452,7 +6452,7 @@ center_of_mass_y = 14 bitesize = 2 -/obj/item/reagent_containers/food/snacks/poachedegg/Initialize() +/obj/item/reagent_containers/food/snacks/poachedegg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) @@ -6469,7 +6469,7 @@ center_of_mass_y = 13 bitesize = 4 -/obj/item/reagent_containers/food/snacks/ribplate/Initialize() +/obj/item/reagent_containers/food/snacks/ribplate/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 2) @@ -6517,7 +6517,7 @@ center_of_mass_y = 14 bitesize = 1 -/obj/item/reagent_containers/food/snacks/mint/Initialize() +/obj/item/reagent_containers/food/snacks/mint/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MINT, 1) @@ -6557,7 +6557,7 @@ nutriment_desc = list("candy" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/candy/Initialize() +/obj/item/reagent_containers/food/snacks/candy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 3) @@ -6574,7 +6574,7 @@ nutriment_desc = list("candy" = 2, "sweetness" = 2) bitesize = 2 -/obj/item/reagent_containers/food/snacks/namagashi/Initialize() +/obj/item/reagent_containers/food/snacks/namagashi/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) @@ -6589,7 +6589,7 @@ nutriment_desc = list("candy" = 1, REAGENT_ID_PROTEIN = 8) bitesize = 6 -/obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize() +/obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_SUGAR, 4) @@ -6605,7 +6605,7 @@ nutriment_desc = list("artificial fruit flavour" = 2) bitesize = 1 -/obj/item/reagent_containers/food/snacks/candy/gummy/Initialize() +/obj/item/reagent_containers/food/snacks/candy/gummy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 5) @@ -6632,7 +6632,7 @@ nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, PLANT_APPLE = 2) bitesize = 6 -/obj/item/reagent_containers/food/snacks/fruitbar/Initialize() +/obj/item/reagent_containers/food/snacks/fruitbar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 4) @@ -6653,7 +6653,7 @@ w_class = 1 bitesize = 2 -/obj/item/reagent_containers/food/snacks/cb01/Initialize() +/obj/item/reagent_containers/food/snacks/cb01/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) @@ -6670,7 +6670,7 @@ w_class = 1 bitesize = 2 -/obj/item/reagent_containers/food/snacks/cb02/Initialize() +/obj/item/reagent_containers/food/snacks/cb02/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) @@ -6687,7 +6687,7 @@ w_class = 1 bitesize = 2 -/obj/item/reagent_containers/food/snacks/cb03/Initialize() +/obj/item/reagent_containers/food/snacks/cb03/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) @@ -6704,7 +6704,7 @@ w_class = 1 bitesize = 2 -/obj/item/reagent_containers/food/snacks/cb04/Initialize() +/obj/item/reagent_containers/food/snacks/cb04/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) @@ -6721,7 +6721,7 @@ w_class = 1 bitesize = 3 -/obj/item/reagent_containers/food/snacks/cb05/Initialize() +/obj/item/reagent_containers/food/snacks/cb05/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 3) @@ -6738,7 +6738,7 @@ w_class = 1 bitesize = 3 -/obj/item/reagent_containers/food/snacks/cb06/Initialize() +/obj/item/reagent_containers/food/snacks/cb06/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) reagents.add_reagent(REAGENT_ID_COFFEE, 1) @@ -6756,7 +6756,7 @@ w_class = 1 bitesize = 3 -/obj/item/reagent_containers/food/snacks/cb07/Initialize() +/obj/item/reagent_containers/food/snacks/cb07/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) @@ -6773,7 +6773,7 @@ w_class = 1 bitesize = 3 -/obj/item/reagent_containers/food/snacks/cb08/Initialize() +/obj/item/reagent_containers/food/snacks/cb08/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) @@ -6790,7 +6790,7 @@ w_class = 1 bitesize = 3 -/obj/item/reagent_containers/food/snacks/cb09/Initialize() +/obj/item/reagent_containers/food/snacks/cb09/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) reagents.add_reagent(REAGENT_ID_MILK, 1) @@ -6809,7 +6809,7 @@ w_class = 1 bitesize = 3 -/obj/item/reagent_containers/food/snacks/cb10/Initialize() +/obj/item/reagent_containers/food/snacks/cb10/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -6891,7 +6891,7 @@ center_of_mass_y = 9 bitesize = 2 -/obj/item/reagent_containers/food/snacks/sosjerky/Initialize() +/obj/item/reagent_containers/food/snacks/sosjerky/Initialize(mapload) . =..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -6909,7 +6909,7 @@ pickup_sound = 'sound/items/pickup/soda.ogg' bitesize = 2 -/obj/item/reagent_containers/food/snacks/unajerky/Initialize() +/obj/item/reagent_containers/food/snacks/unajerky/Initialize(mapload) . =..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) @@ -6928,7 +6928,7 @@ nutriment_desc = list("smoked fish" = 5) bitesize = 2 -/obj/item/reagent_containers/food/snacks/tuna/Initialize() +/obj/item/reagent_containers/food/snacks/tuna/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -6971,7 +6971,7 @@ nutriment_amt = 2 bitesize = 1 -/obj/item/reagent_containers/food/snacks/squid/true/Initialize() +/obj/item/reagent_containers/food/snacks/squid/true/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -7001,7 +7001,7 @@ nutriment_amt = 2 bitesize = 2 -/obj/item/reagent_containers/food/snacks/salo/true/Initialize() +/obj/item/reagent_containers/food/snacks/salo/true/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -7018,7 +7018,7 @@ nutriment_amt = 2 bitesize = 1 -/obj/item/reagent_containers/food/snacks/driedfish/Initialize() +/obj/item/reagent_containers/food/snacks/driedfish/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -7046,7 +7046,7 @@ // center_of_mass_y = 11 // bitesize = 2 // -///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize() +///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize(mapload) // . = ..() // reagents.add_reagent(REAGENT_ID_SUGAR, 4) @@ -7078,7 +7078,7 @@ nutriment_amt = 4 bitesize = 3 -/obj/item/reagent_containers/food/snacks/syndicake/Initialize() +/obj/item/reagent_containers/food/snacks/syndicake/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DOCTORSDELIGHT, 5) @@ -7162,7 +7162,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/reagent_containers/food/snacks/venus/Initialize() +/obj/item/reagent_containers/food/snacks/venus/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 5) @@ -7179,7 +7179,7 @@ nutriment_amt = 3 bitesize = 1 -/obj/item/reagent_containers/food/snacks/sun_snax/Initialize() +/obj/item/reagent_containers/food/snacks/sun_snax/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_CAPSAICIN, 6) @@ -7196,7 +7196,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/reagent_containers/food/snacks/oort/Initialize() +/obj/item/reagent_containers/food/snacks/oort/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_FROSTOIL,5) @@ -7266,7 +7266,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/reagent_containers/food/snacks/weebonuts/Initialize() +/obj/item/reagent_containers/food/snacks/weebonuts/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_CAPSAICIN,1) @@ -7280,7 +7280,7 @@ nutriment_amt = 6 bitesize = 2 -/obj/item/reagent_containers/food/snacks/wasabi_peas/Initialize() +/obj/item/reagent_containers/food/snacks/wasabi_peas/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_CAPSAICIN,1) @@ -7294,7 +7294,7 @@ nutriment_amt = 5 bitesize = 2 -/obj/item/reagent_containers/food/snacks/chocobanana/Initialize() +/obj/item/reagent_containers/food/snacks/chocobanana/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_SPRINKLES, 10) @@ -7330,7 +7330,7 @@ nutriment_amt = 10 bitesize = 3 filling_color = "#336b42" -/obj/item/reagent_containers/food/snacks/old/Initialize() +/obj/item/reagent_containers/food/snacks/old/Initialize(mapload) .=..() reagents.add_reagent(pick(list( REAGENT_ID_FUEL, @@ -7392,7 +7392,7 @@ nutriment_desc = list("beef" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/canned/beef/Initialize() +/obj/item/reagent_containers/food/snacks/canned/beef/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2) @@ -7409,7 +7409,7 @@ nutriment_desc = list(REAGENT_BEANPROTEIN = 1, "tomato sauce" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/canned/beans/Initialize() +/obj/item/reagent_containers/food/snacks/canned/beans/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 5) reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5) @@ -7425,7 +7425,7 @@ center_of_mass_y = 9 bitesize = 3 -/obj/item/reagent_containers/food/snacks/canned/tomato/Initialize() +/obj/item/reagent_containers/food/snacks/canned/tomato/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 12) @@ -7441,7 +7441,7 @@ nutriment_desc = list("soggy" = 1, "vegetable" = 1) bitesize = 3 -/obj/item/reagent_containers/food/snacks/canned/spinach/Initialize() +/obj/item/reagent_containers/food/snacks/canned/spinach/Initialize(mapload) .=..() reagents.add_reagent(REAGENT_ID_ADRENALINE, 4) reagents.add_reagent(REAGENT_ID_HYPERZINE, 4) @@ -7461,7 +7461,7 @@ nutriment_desc = list("salt" = 1) bitesize = 1 -/obj/item/reagent_containers/food/snacks/canned/caviar/Initialize() +/obj/item/reagent_containers/food/snacks/canned/caviar/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 5) @@ -7477,7 +7477,7 @@ nutriment_desc = list("salt" = 1, "a numbing sensation" = 1) bitesize = 1 -/obj/item/reagent_containers/food/snacks/canned/caviar/true/Initialize() +/obj/item/reagent_containers/food/snacks/canned/caviar/true/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 4) reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 1) @@ -7493,7 +7493,7 @@ center_of_mass_y = 9 bitesize = 2 -/obj/item/reagent_containers/food/snacks/canned/maps/Initialize() +/obj/item/reagent_containers/food/snacks/canned/maps/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2) @@ -7510,7 +7510,7 @@ nutriment_desc = list(PLANT_APPLE = 1, "sweetness" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize() +/obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MILK, 8) reagents.add_reagent(REAGENT_ID_SUGAR, 5) @@ -7526,7 +7526,7 @@ center_of_mass_y = 9 bitesize = 2 -/obj/item/reagent_containers/food/snacks/canned/ntbeans/Initialize() +/obj/item/reagent_containers/food/snacks/canned/ntbeans/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 6) reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -7546,7 +7546,7 @@ bitesize = 2 var/brainmeat = REAGENT_ID_BRAINPROTEIN -/obj/item/reagent_containers/food/snacks/canned/brainzsnax/Initialize() +/obj/item/reagent_containers/food/snacks/canned/brainzsnax/Initialize(mapload) . = ..() reagents.add_reagent(brainmeat, 10) @@ -7631,7 +7631,7 @@ nutriment_desc = list("sweetness" = 4, "cake" = 2) bitesize = 2 -/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/spacetwinkie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 4) @@ -7661,7 +7661,7 @@ nutriment_desc = list("chalk" = 3, "meat" = 3) bitesize = 2 -/obj/item/reagent_containers/food/snacks/packaged/meatration/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/meatration/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -7691,7 +7691,7 @@ nutriment_desc = list("sweetness" = 5, "cake" = 1) bitesize = 2 -/obj/item/reagent_containers/food/snacks/packaged/sweetration/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/sweetration/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 6) @@ -7704,7 +7704,7 @@ nutriment_amt = 3 nutriment_desc = list("stale burger" = 3) -/obj/item/reagent_containers/food/snacks/packaged/vendburger/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/vendburger/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -7717,7 +7717,7 @@ nutriment_amt = 3 nutriment_desc = list("stale hotdog" = 3) -/obj/item/reagent_containers/food/snacks/packaged/vendhotdog/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/vendhotdog/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) @@ -7730,6 +7730,6 @@ nutriment_amt = 3 nutriment_desc = list("stale burrito" = 3) -/obj/item/reagent_containers/food/snacks/packaged/vendburrito/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/vendburrito/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index 8ea9b08e84..33f1419307 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -7,7 +7,7 @@ center_of_mass_x = 16 center_of_mass_y = 14 -/obj/item/reagent_containers/food/snacks/meat/Initialize() +/obj/item/reagent_containers/food/snacks/meat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 2) @@ -54,7 +54,7 @@ cooked_icon = "chickensteak" filling_color = "#BBBBAA" -/obj/item/reagent_containers/food/snacks/meat/chicken/Initialize() +/obj/item/reagent_containers/food/snacks/meat/chicken/Initialize(mapload) . = ..() reagents.remove_reagent(REAGENT_ID_TRIGLYCERIDE, INFINITY) //Chicken is low fat. Less total calories than other meats @@ -65,7 +65,7 @@ icon_state = "crabmeat" bitesize = 1 -/obj/item/reagent_containers/food/snacks/crabmeat/Initialize() +/obj/item/reagent_containers/food/snacks/crabmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SEAFOOD, 2) @@ -80,7 +80,7 @@ nutriment_desc = list("raw" = 2, PLANT_MUSHROOMS = 2) bitesize = 6 -/obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize() +/obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) @@ -104,7 +104,7 @@ center_of_mass_y = 10 bitesize = 3 -/obj/item/reagent_containers/food/snacks/bearmeat/Initialize() +/obj/item/reagent_containers/food/snacks/bearmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 12) reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) @@ -118,7 +118,7 @@ center_of_mass_y = 10 bitesize = 6 -/obj/item/reagent_containers/food/snacks/xenomeat/Initialize() +/obj/item/reagent_containers/food/snacks/xenomeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_PACID,6) @@ -132,7 +132,7 @@ center_of_mass_y = 10 bitesize = 6 -/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize() +/obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6) reagents.remove_reagent(REAGENT_ID_PACID,6) @@ -143,7 +143,7 @@ icon_state = "rawturkey" bitesize = 2.5 -/obj/item/reagent_containers/food/snacks/rawturkey/Initialize() +/obj/item/reagent_containers/food/snacks/rawturkey/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -159,7 +159,7 @@ center_of_mass_x = 16 center_of_mass_y = 10 -/obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize() +/obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) @@ -174,7 +174,7 @@ center_of_mass_x = 16 center_of_mass_y = 14 -/obj/item/reagent_containers/food/snacks/meat/worm/Initialize() +/obj/item/reagent_containers/food/snacks/meat/worm/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_PHORON, 3) diff --git a/code/modules/food/food/snacks_ch.dm b/code/modules/food/food/snacks_ch.dm index 3838ded5f3..d8e675be72 100644 --- a/code/modules/food/food/snacks_ch.dm +++ b/code/modules/food/food/snacks_ch.dm @@ -115,7 +115,7 @@ nutriment_amt = 15 nutriment_desc = list("tortilla" = 2, "meat" = 3, "bean" = 5, REAGENT_ID_CHEESE = 3, "Mexico" = 7) -/obj/item/reagent_containers/food/snacks/slice/bigbeanburrito/Initialize() +/obj/item/reagent_containers/food/snacks/slice/bigbeanburrito/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 12) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 15) @@ -132,7 +132,7 @@ nutriment_amt = 50 -/obj/item/reagent_containers/food/snacks/sliceable/supremoburrito/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/supremoburrito/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 50) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 55) @@ -282,7 +282,7 @@ new /obj/item/reagent_containers/food/snacks/tastybread/sequel(src) qdel(src) //Dispose of the body, let no one find it. -/obj/item/reagent_containers/food/snacks/tastybread/sequel/Initialize() +/obj/item/reagent_containers/food/snacks/tastybread/sequel/Initialize(mapload) . = ..() bitesize = 4 @@ -302,7 +302,7 @@ center_of_mass_y= 9 //CHOMPEdit bitesize = 2 -/obj/item/reagent_containers/food/snacks/sliceable/blondies/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/blondies/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -321,7 +321,7 @@ /obj/item/reagent_containers/food/snacks/blondiesslice/filled nutriment_amt = 1 -/obj/item/reagent_containers/food/snacks/blondiesslice/filled/Initialize() +/obj/item/reagent_containers/food/snacks/blondiesslice/filled/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -336,6 +336,6 @@ nutriment_desc = list("deep fried dough" = 2) nutriment_amt = 2 -/obj/item/reagent_containers/food/snacks/churro/Initialize() +/obj/item/reagent_containers/food/snacks/churro/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COOKINGOIL, 1) diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index c4d361c0b8..7e29b10387 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -9,7 +9,7 @@ nutriment_desc = list(REAGENT_ID_RICE = 5, "fish" = 5) nutriment_amt = 15 -/obj/item/reagent_containers/food/snacks/sliceable/sushi/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/sushi/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 10) bitesize = 5 @@ -35,7 +35,7 @@ nutriment_desc = list("meat" = 2, "vegetables" = 2, "seasoning" = 5) eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/goulash/Initialize() +/obj/item/reagent_containers/food/snacks/goulash/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) //For meaty things. reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -49,7 +49,7 @@ nutriment_amt = 5 nutriment_desc = list("vegetables" = 2, "seasoned meat" = 5) -/obj/item/reagent_containers/food/snacks/donerkebab/Initialize() +/obj/item/reagent_containers/food/snacks/donerkebab/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) //For meaty things. @@ -63,7 +63,7 @@ nutriment_amt = 8 nutriment_desc = list("cooked meat" = 5) -/obj/item/reagent_containers/food/snacks/roastbeef/Initialize() +/obj/item/reagent_containers/food/snacks/roastbeef/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) //For meaty things. bitesize = 2 @@ -77,7 +77,7 @@ nutriment_amt = 3 nutriment_desc = list(REAGENT_ID_CHOCOLATE = 4, "colors" = 2) -/obj/item/reagent_containers/food/snacks/reishicup/Initialize() +/obj/item/reagent_containers/food/snacks/reishicup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) bitesize = 6 @@ -96,7 +96,7 @@ ) foldable = null -/obj/item/storage/box/wings/Initialize() +/obj/item/storage/box/wings/Initialize(mapload) . = ..() update_icon() return @@ -115,7 +115,7 @@ nutriment_amt = 2 nutriment_desc = list("chicken" = 2, "unplacable flavor sauce" = 4) -/obj/item/reagent_containers/food/snacks/chickenwing/Initialize() +/obj/item/reagent_containers/food/snacks/chickenwing/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) bitesize = 3 @@ -131,7 +131,7 @@ nutriment_desc = list("spicyness" = 4, "sourness" = 4, REAGENT_ID_TOFU = 1) eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize() +/obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize(mapload) . = ..() bitesize = 2 reagents.add_reagent(REAGENT_ID_HOTNSOURSOUP, 10) @@ -146,7 +146,7 @@ nutriment_desc = list("fried egg" = 2, "egg noodles" = 4) eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/kitsuneudon/Initialize() +/obj/item/reagent_containers/food/snacks/kitsuneudon/Initialize(mapload) . = ..() bitesize = 2 @@ -159,7 +159,7 @@ nutriment_amt = 6 nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3) -/obj/item/reagent_containers/food/snacks/generalschicken/Initialize() +/obj/item/reagent_containers/food/snacks/generalschicken/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) bitesize = 2 @@ -175,7 +175,7 @@ nutriment_amt = 1 nutriment_desc = list("crunchy shell bits" = 5) -/obj/item/reagent_containers/food/snacks/bugball/Initialize() +/obj/item/reagent_containers/food/snacks/bugball/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_CARBON, 5) @@ -190,7 +190,7 @@ nutriment_amt = 3 nutriment_desc = list("sparkles" = 5, "ancient inca culture" =3) -/obj/item/reagent_containers/food/snacks/pillbug/Initialize() +/obj/item/reagent_containers/food/snacks/pillbug/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) @@ -204,7 +204,7 @@ nutriment_amt = 1 nutriment_desc = list("crunchy shell bits" = 5) -/obj/item/reagent_containers/food/snacks/pillbug/Initialize() +/obj/item/reagent_containers/food/snacks/pillbug/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_CARBON, 5) @@ -219,7 +219,7 @@ nutriment_amt = 3 nutriment_desc = list("brothy sweet goodness" = 5) -/obj/item/reagent_containers/food/snacks/mammi/Initialize() +/obj/item/reagent_containers/food/snacks/mammi/Initialize(mapload) . = ..() bitesize = 3 @@ -232,7 +232,7 @@ nutriment_amt = 15 nutriment_desc = list("Cheese" = 5, "eggs" = 3, "pasta" = 4, "sparkles" = 3) -/obj/item/reagent_containers/food/snacks/makaroni/Initialize() +/obj/item/reagent_containers/food/snacks/makaroni/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) @@ -245,7 +245,7 @@ icon_state = "lobster_raw" nutriment_amt = 5 -/obj/item/reagent_containers/food/snacks/lobster/Initialize() +/obj/item/reagent_containers/food/snacks/lobster/Initialize(mapload) . = ..() bitesize = 0.1 @@ -258,7 +258,7 @@ nutriment_amt = 20 nutriment_desc = list(PLANT_LEMON = 2, "lobster" = 5, "salad" = 2) -/obj/item/reagent_containers/food/snacks/lobstercooked/Initialize() +/obj/item/reagent_containers/food/snacks/lobstercooked/Initialize(mapload) . = ..() bitesize = 5 reagents.add_reagent(REAGENT_ID_PROTEIN, 20) @@ -272,7 +272,7 @@ icon_state = "cuttlefish_raw" nutriment_amt = 5 -/obj/item/reagent_containers/food/snacks/cuttlefish/Initialize() +/obj/item/reagent_containers/food/snacks/cuttlefish/Initialize(mapload) . = ..() bitesize = 10 @@ -284,7 +284,7 @@ nutriment_amt = 20 nutriment_desc = list("cuttlefish" = 5, "rubber" = 5, "grease" = 1) -/obj/item/reagent_containers/food/snacks/cuttlefishcooked/Initialize() +/obj/item/reagent_containers/food/snacks/cuttlefishcooked/Initialize(mapload) . = ..() bitesize = 5 reagents.add_reagent(REAGENT_ID_PROTEIN, 10) @@ -300,7 +300,7 @@ slices_num = 6 trash = /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains -/obj/item/reagent_containers/food/snacks/sliceable/monkfish/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/monkfish/Initialize(mapload) . = ..() bitesize = 2 @@ -311,7 +311,7 @@ icon_state = "monkfish_fillet" nutriment_amt = 5 -/obj/item/reagent_containers/food/snacks/monkfishfillet/Initialize() +/obj/item/reagent_containers/food/snacks/monkfishfillet/Initialize(mapload) . = ..() bitesize = 3 reagents.add_reagent(REAGENT_ID_PROTEIN, 1) @@ -325,7 +325,7 @@ nutriment_desc = list("fish" = 3, REAGENT_ID_OIL = 1, "sweet chili" = 3, "spring onion" = 2) trash = /obj/item/trash/fancyplate -/obj/item/reagent_containers/food/snacks/monkfishcooked/Initialize() +/obj/item/reagent_containers/food/snacks/monkfishcooked/Initialize(mapload) . = ..() bitesize = 4 reagents.add_reagent(REAGENT_ID_PROTEIN, 5) @@ -340,7 +340,7 @@ slice_path = /obj/item/clothing/head/fish slices_num = 1 -/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize(mapload) . = ..() bitesize = 0.01 //impossible to eat reagents.add_reagent(REAGENT_ID_CARBON, 5) @@ -355,7 +355,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat slices_num = 5 -/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize() +/obj/item/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize(mapload) . = ..() bitesize = 3 reagents.add_reagent(REAGENT_ID_PROTEIN, 20) @@ -368,7 +368,7 @@ nutriment_amt = 2 toxin_amount = null -/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize() +/obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize(mapload) . = ..() bitesize = 3 reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -383,7 +383,7 @@ trash = /obj/item/trash/plate nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2) -/obj/item/reagent_containers/food/snacks/sharkmeatcooked/Initialize() +/obj/item/reagent_containers/food/snacks/sharkmeatcooked/Initialize(mapload) . = ..() bitesize = 3 reagents.add_reagent(REAGENT_ID_PROTEIN, 8) @@ -397,7 +397,7 @@ trash = /obj/item/trash/snack_bowl nutriment_desc = list("salt" = 1, "fish oil" = 2, "spicy shark" = 2) -/obj/item/reagent_containers/food/snacks/sharkmeatdip/Initialize() +/obj/item/reagent_containers/food/snacks/sharkmeatdip/Initialize(mapload) . = ..() bitesize = 3 reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) @@ -412,7 +412,7 @@ trash = /obj/item/trash/plate nutriment_desc = list("viking spirit" = 1, "rot" = 2, "fermented sauce" = 2) -/obj/item/reagent_containers/food/snacks/sharkmeatcubes/Initialize() +/obj/item/reagent_containers/food/snacks/sharkmeatcubes/Initialize(mapload) . = ..() bitesize = 10 reagents.add_reagent(REAGENT_ID_POTATOJUICE, 30) // for people who want to get fat, FAST. @@ -464,7 +464,7 @@ var/food_type = "/obj/item/reagent_containers/food/snacks/proteinslab" -/obj/item/reagent_containers/food/snacks/cube/Initialize() +/obj/item/reagent_containers/food/snacks/cube/Initialize(mapload) . = ..() /obj/item/reagent_containers/food/snacks/cube/proc/Expand() @@ -478,7 +478,7 @@ /obj/item/reagent_containers/food/snacks/cube/protein -/obj/item/reagent_containers/food/snacks/cube/protein/Initialize() +/obj/item/reagent_containers/food/snacks/cube/protein/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MEATCOLONY, 5) @@ -491,7 +491,7 @@ nutriment_amt = 5 nutriment_desc = list("bitter chyme" = 50) -/obj/item/reagent_containers/food/snacks/proteinslab/Initialize() +/obj/item/reagent_containers/food/snacks/proteinslab/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 30) @@ -501,7 +501,7 @@ icon_state = "nutrimentcube" food_type = "/obj/item/reagent_containers/food/snacks/nutrimentslab" -/obj/item/reagent_containers/food/snacks/cube/nutriment/Initialize() +/obj/item/reagent_containers/food/snacks/cube/nutriment/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PLANTCOLONY, 5) @@ -549,7 +549,7 @@ nutriment_amt = 4 nutriment_desc = list(REAGENT_ID_HONEY = 2, "pastry" = 1) -/obj/item/reagent_containers/food/snacks/bun/Initialize() +/obj/item/reagent_containers/food/snacks/bun/Initialize(mapload) . = ..() //Readded Polaris Foods @@ -560,7 +560,7 @@ nutriment_amt = 2 nutriment_desc = list("salt" = 1) -/obj/item/reagent_containers/food/snacks/nachos/Initialize() +/obj/item/reagent_containers/food/snacks/nachos/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 1) bitesize = 1 @@ -572,7 +572,7 @@ nutriment_amt = 5 nutriment_desc = list("salt" = 2, REAGENT_ID_CHEESE = 3) -/obj/item/reagent_containers/food/snacks/cheesenachos/Initialize() +/obj/item/reagent_containers/food/snacks/cheesenachos/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5) reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -590,7 +590,7 @@ bitesize = 4 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/milosoup/Initialize() +/obj/item/reagent_containers/food/snacks/milosoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -605,7 +605,7 @@ bitesize = 3 eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/onionsoup/Initialize() +/obj/item/reagent_containers/food/snacks/onionsoup/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10) @@ -631,7 +631,7 @@ nutriment_amt = 3 nutriment_desc = list("goo" = 1, "slime" = 1) -/obj/item/reagent_containers/food/snacks/grub/Initialize() +/obj/item/reagent_containers/food/snacks/grub/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) bitesize = 3 @@ -644,7 +644,7 @@ nutriment_amt = 5 nutriment_desc = list(PLANT_CHERRY = 4, "goo" = 1) -/obj/item/reagent_containers/food/snacks/grub_pink/Initialize() +/obj/item/reagent_containers/food/snacks/grub_pink/Initialize(mapload) . = ..() bitesize = 3 @@ -656,7 +656,7 @@ nutriment_amt = 5 nutriment_desc = list("grape" = 4, "goo" = 1) -/obj/item/reagent_containers/food/snacks/grub_purple/Initialize() +/obj/item/reagent_containers/food/snacks/grub_purple/Initialize(mapload) . = ..() bitesize = 3 @@ -668,7 +668,7 @@ nutriment_amt = 5 nutriment_desc = list("blueberry" = 4, "goo" = 1) -/obj/item/reagent_containers/food/snacks/grub_blue/Initialize() +/obj/item/reagent_containers/food/snacks/grub_blue/Initialize(mapload) . = ..() bitesize = 3 @@ -680,7 +680,7 @@ nutriment_amt = 8 nutriment_desc = list("crunchy" = 4, "shell bits" = 1) -/obj/item/reagent_containers/food/snacks/scorpion/Initialize() +/obj/item/reagent_containers/food/snacks/scorpion/Initialize(mapload) . = ..() bitesize = 1 @@ -692,7 +692,7 @@ nutriment_amt = 6 nutriment_desc = list("crispy" = 4, "exotic meat" = 1) -/obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize() +/obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2) reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -708,7 +708,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/antball slices_num = 1 -/obj/item/reagent_containers/food/snacks/ant/Initialize() +/obj/item/reagent_containers/food/snacks/ant/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HONEY, 2) reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -722,7 +722,7 @@ nutriment_amt = 4 nutriment_desc = list("goo" = 1) -/obj/item/reagent_containers/food/snacks/antball/Initialize() +/obj/item/reagent_containers/food/snacks/antball/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HONEY, 2) bitesize = 1 @@ -737,7 +737,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/antball slices_num = 1 -/obj/item/reagent_containers/food/snacks/honey_candy/Initialize() +/obj/item/reagent_containers/food/snacks/honey_candy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) bitesize = 2 @@ -750,7 +750,7 @@ nutriment_amt = 4 nutriment_desc = list("crunchy" = 1, "goo" = 1) -/obj/item/reagent_containers/food/snacks/locust/Initialize() +/obj/item/reagent_containers/food/snacks/locust/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 1) bitesize = 2 @@ -763,7 +763,7 @@ nutriment_amt = 2 nutriment_desc = list("crunchy" = 4) -/obj/item/reagent_containers/food/snacks/locust_cooked/Initialize() +/obj/item/reagent_containers/food/snacks/locust_cooked/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) bitesize = 2 @@ -777,7 +777,7 @@ nutriment_desc = list("burning fires of radioactive hell" = 20) heated_reagents = list(REAGENT_ID_SUPERMATTER = 1) -/obj/item/reagent_containers/food/snacks/donkpocket/ascended/Initialize() +/obj/item/reagent_containers/food/snacks/donkpocket/ascended/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_URANIUM, 3) reagents.add_reagent(REAGENT_ID_THERMITEV, 3) @@ -818,7 +818,7 @@ nutriment_desc = list("essence of steak" = 6) eating_sound = 'sound/items/drink.ogg' -/obj/item/reagent_containers/food/snacks/ratliquid/Initialize() +/obj/item/reagent_containers/food/snacks/ratliquid/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -831,7 +831,7 @@ nutriment_amt = 8 nutriment_desc = list("steak" = 5, "smoked cheese" = 2, "veggies" = 1) -/obj/item/reagent_containers/food/snacks/ratsteak/Initialize() +/obj/item/reagent_containers/food/snacks/ratsteak/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) @@ -902,7 +902,7 @@ "ace" = 3) var/randomize_bowl_color = TRUE -/obj/item/reagent_containers/food/snacks/ratpackramen/Initialize() +/obj/item/reagent_containers/food/snacks/ratpackramen/Initialize(mapload) . = ..() if(randomize_bowl_color) var/bowl_color = pickweight(bowl_color_options) @@ -958,7 +958,7 @@ bitesize = 2 nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, PLANT_ORANGE = 4, "cake" = 3) -/obj/item/reagent_containers/food/snacks/bourbon/Initialize() +/obj/item/reagent_containers/food/snacks/bourbon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COCO, 2) @@ -1035,7 +1035,7 @@ nutriment_amt = 4 nutriment_desc = list("pastry" = 5, "meat" = 5, PLANT_ONION = 2, PLANT_POTATO = 3) -/obj/item/reagent_containers/food/snacks/packaged/pasty/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/pasty/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -1050,7 +1050,7 @@ nutriment_desc = list(REAGENT_ID_SUGAR = 5) var/list/color_options = list("saucer_pink","saucer_blue","saucer_orange","saucer_green","saucer_yellow") -/obj/item/reagent_containers/food/snacks/saucer/Initialize() +/obj/item/reagent_containers/food/snacks/saucer/Initialize(mapload) . = ..() icon_state = pick(color_options) @@ -1114,7 +1114,7 @@ ) foldable = null -/obj/item/reagent_containers/food/snacks/bourbon/Initialize() +/obj/item/reagent_containers/food/snacks/bourbon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COCO, 2) @@ -1127,7 +1127,7 @@ nutriment_amt = 3 nutriment_desc = list("pastry" = 5, "meat" = 5) -/obj/item/reagent_containers/food/snacks/packaged/sausageroll/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/sausageroll/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -1140,7 +1140,7 @@ nutriment_amt = 3 nutriment_desc = list(REAGENT_ID_EGG = 5, "meat" = 5, "bread" = 2) -/obj/item/reagent_containers/food/snacks/packaged/scotchegg/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/scotchegg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) @@ -1190,7 +1190,7 @@ nutriment_desc = list(REAGENT_ID_SUGAR = 5, PLANT_ROSE = 2, "custard" = 2) var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2") -/obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize() +/obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize(mapload) . = ..() icon_state = pick(color_options) @@ -1217,6 +1217,6 @@ nutriment_amt = 3 nutriment_desc = list("pastry" = 5, "meat" = 5) -/obj/item/reagent_containers/food/snacks/packaged/porkpie/Initialize() +/obj/item/reagent_containers/food/snacks/packaged/porkpie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index d0dd4f096b..dcd9fc4a61 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -182,7 +182,7 @@ nutriment_amt = 4 volume = 80 -/obj/item/reagent_containers/food/snacks/chaoscakeslice/Initialize() +/obj/item/reagent_containers/food/snacks/chaoscakeslice/Initialize(mapload) . = ..() var/i = rand(1,6) icon_state = "chaoscake_slice-[i]" diff --git a/code/modules/food/food/superfoods_ch.dm b/code/modules/food/food/superfoods_ch.dm index 408b1bdc3d..9c0f4016d8 100644 --- a/code/modules/food/food/superfoods_ch.dm +++ b/code/modules/food/food/superfoods_ch.dm @@ -423,8 +423,8 @@ nutriment_amt = 4 volume = 80 -/obj/item/reagent_containers/food/snacks/chaoscakeslice/Initialize() - ..() +/obj/item/reagent_containers/food/snacks/chaoscakeslice/Initialize(mapload) + . = ..() var/i = rand(1,6) icon_state = "chaoscake_slice-[i]" switch(i) diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm index 71f2a810a0..a481cf9924 100644 --- a/code/modules/food/food/z_custom_food_vr.dm +++ b/code/modules/food/food/z_custom_food_vr.dm @@ -18,13 +18,12 @@ var/global/ingredientLimit = 20000 var/image/topping var/image/filling -/obj/item/reagent_containers/food/snacks/customizable/Initialize(loc,ingredient) +/obj/item/reagent_containers/food/snacks/customizable/Initialize(mapload,ingredient) . = ..() topping = image(icon,,"[initial(icon_state)]_top") filling = image(icon,,"[initial(icon_state)]_filling") - src.reagents.add_reagent(REAGENT_ID_NUTRIMENT,3) - src.updateName() - return + reagents.add_reagent(REAGENT_ID_NUTRIMENT,3) + updateName() /obj/item/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user) if(istype(I,/obj/item/reagent_containers/food/snacks)) diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index fe3b6d90ea..191243c08e 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -29,7 +29,7 @@ ..() update_icon() -/obj/item/reagent_containers/glass/bottle/Initialize() +/obj/item/reagent_containers/glass/bottle/Initialize(mapload) . = ..() if(!icon_state) icon_state = "bottle-[rand(1,4)]" diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm index edceb1a80a..96a2352a87 100644 --- a/code/modules/food/glass/bottle_vr.dm +++ b/code/modules/food/glass/bottle_vr.dm @@ -149,7 +149,7 @@ name = "glucose container" desc = "A container of glucose. Used to treat bloodloss through a hardsuit in unconscious patients." -/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose/Initialize() +/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_GLUCOSE, 100) on_reagent_change() diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index a22edb4f07..f8591564c2 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -48,7 +48,7 @@ var/static/radial_safety = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_safety") var/static/radial_output = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_change_output") -/obj/machinery/appliance/Initialize() +/obj/machinery/appliance/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm index e45a6e544b..d4d7350564 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker.dm +++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm @@ -113,7 +113,7 @@ // to_world("Our cooking_power is [cooking_power] and our efficiency is [(cooking_power / optimal_power) * 100].") // Debug lines, uncomment if you need to test. return (cooking_power / optimal_power) * 100 -/obj/machinery/appliance/cooker/Initialize() +/obj/machinery/appliance/cooker/Initialize(mapload) . = ..() loss = (active_power_usage / resistance)*0.5 cooking_objs = list() diff --git a/code/modules/food/kitchen/cooking_machines/_cooker_output.dm b/code/modules/food/kitchen/cooking_machines/_cooker_output.dm index a90a5816d0..1dd82fd33d 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker_output.dm +++ b/code/modules/food/kitchen/cooking_machines/_cooker_output.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/food_custom.dmi' desc = "If you can see this description then something is wrong. Please report the bug on the tracker." bitesize = 2 - + var/size = 5 //The quantity of reagents which is considered "normal" for this kind of food //These objects will change size depending on the ratio of reagents to this value var/min_scale = 0.5 @@ -14,7 +14,7 @@ w_class = 2 var/prefix -/obj/item/reagent_containers/food/snacks/variable/Initialize() +/obj/item/reagent_containers/food/snacks/variable/Initialize(mapload) . = ..() if (reagents) reagents.maximum_volume = size*8 + 10 @@ -149,7 +149,7 @@ size = 30 w_class = 3 -/obj/item/reagent_containers/food/snacks/variable/cereal/Initialize() +/obj/item/reagent_containers/food/snacks/variable/cereal/Initialize(mapload) . =..() name = pick(list("flakes", "krispies", "crunch", "pops", "O's", "crisp", "loops", "jacks", "clusters")) @@ -157,4 +157,4 @@ desc = "Poor little thing." size = 5 w_class = 1 - var/kitchen_tag = "animal" \ No newline at end of file + var/kitchen_tag = "animal" diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/kitchen/cooking_machines/_mixer.dm index 504a80ab89..ba0ad21217 100644 --- a/code/modules/food/kitchen/cooking_machines/_mixer.dm +++ b/code/modules/food/kitchen/cooking_machines/_mixer.dm @@ -20,7 +20,7 @@ fundamental differences if(Adjacent(user)) . += span_notice("It is currently set to make a [selected_option]") -/obj/machinery/appliance/mixer/Initialize() +/obj/machinery/appliance/mixer/Initialize(mapload) . = ..() cooking_objs += new /datum/cooking_item(new /obj/item/reagent_containers/cooking_container(src)) cooking = FALSE diff --git a/code/modules/food/kitchen/cooking_machines/candy.dm b/code/modules/food/kitchen/cooking_machines/candy.dm index e17c141fdf..4bcce895d9 100644 --- a/code/modules/food/kitchen/cooking_machines/candy.dm +++ b/code/modules/food/kitchen/cooking_machines/candy.dm @@ -17,7 +17,7 @@ "Jelly" = /obj/item/reagent_containers/food/snacks/variable/jelly ) -/obj/machinery/appliance/mixer/candy/Initialize() +/obj/machinery/appliance/mixer/candy/Initialize(mapload) . = ..() candymaker_loop = new(list(src), FALSE) diff --git a/code/modules/food/kitchen/cooking_machines/cereal.dm b/code/modules/food/kitchen/cooking_machines/cereal.dm index 8ec9730bee..820f00e456 100644 --- a/code/modules/food/kitchen/cooking_machines/cereal.dm +++ b/code/modules/food/kitchen/cooking_machines/cereal.dm @@ -14,7 +14,7 @@ "Cereal" = /obj/item/reagent_containers/food/snacks/variable/cereal ) -/obj/machinery/appliance/mixer/cereal/Initialize() +/obj/machinery/appliance/mixer/cereal/Initialize(mapload) . = ..() cerealmaker_loop = new(list(src), FALSE) diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 2d519d75f9..1cfcbea2cb 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -19,7 +19,7 @@ /obj/item/clothing/head/beret ) -/obj/item/reagent_containers/cooking_container/Initialize() +/obj/item/reagent_containers/cooking_container/Initialize(mapload) . = ..() create_reagents(max_reagents) flags |= OPENCONTAINER | NOREACT @@ -188,7 +188,7 @@ max_space = 30 max_reagents = 120 -/obj/item/reagent_containers/cooking_container/oven/Initialize() +/obj/item/reagent_containers/cooking_container/oven/Initialize(mapload) . = ..() // We add to the insertable list specifically for the oven trays, to allow specialty cakes. @@ -208,7 +208,7 @@ desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly. Alt click to remove contents." icon_state = "grillrack" -/obj/item/reagent_containers/cooking_container/grill/Initialize() +/obj/item/reagent_containers/cooking_container/grill/Initialize(mapload) . = ..() // Needed for the special recipes of the grill diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm index 8632f96e68..5a73b1e768 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/kitchen/cooking_machines/fryer.dm @@ -34,7 +34,7 @@ var/datum/reagents/oil var/optimal_oil = 9000 //90 litres of cooking oil -/obj/machinery/appliance/cooker/fryer/Initialize() +/obj/machinery/appliance/cooker/fryer/Initialize(mapload) . = ..() fry_loop = new(list(src), FALSE) diff --git a/code/modules/food/kitchen/cooking_machines/grill.dm b/code/modules/food/kitchen/cooking_machines/grill.dm index 857522fd66..461ee3c1b5 100644 --- a/code/modules/food/kitchen/cooking_machines/grill.dm +++ b/code/modules/food/kitchen/cooking_machines/grill.dm @@ -26,7 +26,7 @@ max_contents = 3 // Arbitrary number, 3 grill 'racks' container_type = /obj/item/reagent_containers/cooking_container/grill -/obj/machinery/appliance/cooker/grill/Initialize() +/obj/machinery/appliance/cooker/grill/Initialize(mapload) . = ..() grill_loop = new(list(src), FALSE) diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm index 0d9de1f9fd..e7f1b6ffe9 100644 --- a/code/modules/food/kitchen/cooking_machines/oven.dm +++ b/code/modules/food/kitchen/cooking_machines/oven.dm @@ -39,7 +39,7 @@ "Donut" = /obj/item/reagent_containers/food/snacks/variable/donut, ) -/obj/machinery/appliance/cooker/oven/Initialize() +/obj/machinery/appliance/cooker/oven/Initialize(mapload) . = ..() oven_loop = new(list(src), FALSE) diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm index 2ebfaf8548..30e6dc0b86 100644 --- a/code/modules/food/kitchen/gibber.dm +++ b/code/modules/food/kitchen/gibber.dm @@ -23,7 +23,7 @@ /obj/machinery/gibber/autogibber var/turf/input_plate -/obj/machinery/gibber/autogibber/Initialize() +/obj/machinery/gibber/autogibber/Initialize(mapload) . = ..() for(var/i in cardinal) var/obj/machinery/mineral/input/input_obj = locate( /obj/machinery/mineral/input, get_step(src.loc, i) ) diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index ff021c3c1e..35ac4c065f 100644 --- a/code/modules/food/kitchen/icecream.dm +++ b/code/modules/food/kitchen/icecream.dm @@ -51,7 +51,7 @@ else return "vanilla" -/obj/machinery/icecream_vat/Initialize() +/obj/machinery/icecream_vat/Initialize(mapload) . = ..() create_reagents(100) while(product_types.len < 6) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 9ebc0c15a5..8ff38bbe1f 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -34,7 +34,7 @@ * Initialising ********************/ -/obj/machinery/microwave/Initialize() +/obj/machinery/microwave/Initialize(mapload) . = ..() reagents = new/datum/reagents(100) @@ -594,7 +594,7 @@ circuit_item_capacity = 100 item_level = 1 -/obj/machinery/microwave/advanced/Initialize() +/obj/machinery/microwave/advanced/Initialize(mapload) . = ..() reagents.maximum_volume = 1000 diff --git a/code/modules/food/kitchen/microwave_ch.dm b/code/modules/food/kitchen/microwave_ch.dm index 4ee3d5c06b..c2c5ebfb9a 100644 --- a/code/modules/food/kitchen/microwave_ch.dm +++ b/code/modules/food/kitchen/microwave_ch.dm @@ -10,6 +10,6 @@ circuit_item_capacity = 100 item_level = 1 -/obj/machinery/microwave/advanced/Initialize() - ..() - reagents.maximum_volume = 1000 \ No newline at end of file +/obj/machinery/microwave/advanced/Initialize(mapload) + . = ..() + reagents.maximum_volume = 1000 diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm index 39947f77b5..2df984cc58 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm @@ -30,7 +30,7 @@ /obj/machinery/smartfridge/secure is_secure = 1 -/obj/machinery/smartfridge/Initialize() +/obj/machinery/smartfridge/Initialize(mapload) . = ..() if(persistent) SSpersistence.track_value(src, persistent) diff --git a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm index c9f412e6a3..e35c7878f0 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm @@ -57,7 +57,7 @@ /obj/machinery/smartfridge/chemistry/chemvator/down name = "\improper Smart Chemavator - Lower" -/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize() +/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize(mapload) . = ..() var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) if(istype(above)) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index e7f8d445a7..e2b7350edc 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -108,7 +108,7 @@ base_icon = 'icons/turf/flooring/asteroid.dmi' initial_flooring = null -/turf/simulated/floor/holofloor/desert/Initialize() +/turf/simulated/floor/holofloor/desert/Initialize(mapload) . = ..() if(prob(10)) add_overlay("asteroid[rand(0,9)]") diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm index ebea8ec6d2..b22715b985 100644 --- a/code/modules/holomap/mapper.dm +++ b/code/modules/holomap/mapper.dm @@ -81,7 +81,7 @@ "/obj/item/rig/ert/medical" = "ertm" ) -/obj/item/mapping_unit/Initialize() +/obj/item/mapping_unit/Initialize(mapload) . = ..() base_prefix = marker_prefix @@ -406,7 +406,7 @@ var/mapper_filter = HOLOMAP_FILTER_STATIONMAP var/in_list = FALSE -/obj/item/holomap_beacon/Initialize() +/obj/item/holomap_beacon/Initialize(mapload) . = ..() if(in_list) // mapped in turned on in_list = TRUE diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm index 030ea9578d..74f816bfd9 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -34,7 +34,7 @@ ..() flags |= ON_BORDER // Why? It doesn't help if its not density -/obj/machinery/station_map/Initialize() +/obj/machinery/station_map/Initialize(mapload) . = ..() holomap_datum = new() original_zLevel = loc.z @@ -253,7 +253,7 @@ var/filter = HOLOMAP_FILTER_STATIONMAP var/id = "generic" -/obj/effect/landmark/holomarker/Initialize() +/obj/effect/landmark/holomarker/Initialize(mapload) . = ..() var/datum/holomap_marker/holomarker = new() holomarker.id = id diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm index 91d2e63f1f..ec61882a90 100644 --- a/code/modules/hydroponics/backtank.dm +++ b/code/modules/hydroponics/backtank.dm @@ -27,7 +27,7 @@ var/obj/item/noz var/volume = 500 -/obj/item/watertank/Initialize() +/obj/item/watertank/Initialize(mapload) . = ..() create_reagents(volume) noz = make_noz() @@ -143,7 +143,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)) @@ -171,7 +171,7 @@ icon_state = "waterbackpackjani" item_state = "waterbackpackjani" -/obj/item/watertank/janitor/Initialize() +/obj/item/watertank/janitor/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CLEANER, 500) @@ -200,7 +200,7 @@ item_state = "pepperbackpacksec" volume = 1000 -/obj/item/watertank/pepperspray/Initialize() +/obj/item/watertank/pepperspray/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 1000) @@ -231,7 +231,7 @@ volume = 2000 slowdown = 0 -/obj/item/watertank/op/Initialize() +/obj/item/watertank/op/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FUEL, 500) reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 500) @@ -264,7 +264,7 @@ item_state = "waterbackpackatmos" volume = 200 -/obj/item/watertank/atmos/Initialize() +/obj/item/watertank/atmos/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 200) diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index fe072adf6c..80c351fabe 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -217,7 +217,7 @@ var/honey = 0 -/obj/item/honey_frame/Initialize() +/obj/item/honey_frame/Initialize(mapload) . = ..() update_icon() @@ -258,7 +258,7 @@ pass_color = TRUE strict_color_stacking = TRUE -/obj/item/stack/material/wax/Initialize() +/obj/item/stack/material/wax/Initialize(mapload) . = ..() recipes = wax_recipes diff --git a/code/modules/hydroponics/fruit_spawner.dm b/code/modules/hydroponics/fruit_spawner.dm index eaaa92f1be..0878d12e3c 100644 --- a/code/modules/hydroponics/fruit_spawner.dm +++ b/code/modules/hydroponics/fruit_spawner.dm @@ -5,7 +5,7 @@ icon_state = "no name" var/seedtype = null -/obj/fruitspawner/Initialize() +/obj/fruitspawner/Initialize(mapload) ..() if(!seedtype || !SSplants.seeds[seedtype]) return diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index aea5c30147..ec8f603a6b 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -8,7 +8,7 @@ var/plantname var/potency = 1 -/obj/item/grown/Initialize(ml, planttype) +/obj/item/grown/Initialize(mapload, planttype) . = ..() diff --git a/code/modules/hydroponics/seed_machines_yw.dm b/code/modules/hydroponics/seed_machines_yw.dm index dad5d21e49..6f04310556 100644 --- a/code/modules/hydroponics/seed_machines_yw.dm +++ b/code/modules/hydroponics/seed_machines_yw.dm @@ -28,16 +28,17 @@ var/list/datum/reagent/allowed_reagents = list() //compile the list of reagents we're allowed to splice in -/obj/machinery/botany/precisioneditor/Initialize() - for(var/R in SSchemistry.chemical_reagents) - testlist.Add(R) - var/datum/reagent/current = SSchemistry.chemical_reagents[R] +/obj/machinery/botany/precisioneditor/Initialize(mapload) + . = ..() + for(var/R in SSchemistry.chemical_reagents) + testlist.Add(R) + var/datum/reagent/current = SSchemistry.chemical_reagents[R] /*CHOMP Edit: Remove Phorochem code if(istype(current, /datum/reagent/phororeagent)) //phorochems are banned from this process, obviously continue */ - allowed_reagents.Add(R) - allowed_reagents -= banlist //apparently outright checking if it's in the banlist before it's added doesn't work? + allowed_reagents.Add(R) + allowed_reagents -= banlist //apparently outright checking if it's in the banlist before it's added doesn't work? /obj/machinery/botany/precisioneditor/attack_hand(mob/user as mob) tgui_interact(user) diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 384681978c..26afcfedd6 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -77,7 +77,7 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/random seed_type = null -/obj/item/seeds/random/Initialize() +/obj/item/seeds/random/Initialize(mapload) seed = SSplants.create_random_seed() seed_type = seed.name . = ..() diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 37f243a8cd..6fa9869c2e 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -184,7 +184,7 @@ nymph.visible_message(span_notice(span_bold("[nymph]") + " rolls around in [src] for a bit."),span_notice("You roll around in [src] for a bit.")) return -/obj/machinery/portable_atmospherics/hydroponics/Initialize() +/obj/machinery/portable_atmospherics/hydroponics/Initialize(mapload) ..() if(!ov_lowhealth) //VOREStation Add setup_overlays() //VOREStation Add diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 44f5faa56f..cb760a656c 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -79,7 +79,7 @@ w_class = ITEMSIZE_SMALL 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)) @@ -172,7 +172,7 @@ attack_verb = list("played", "jazzed", "trumpeted", "mourned", "dooted", "spooked") /* -/obj/item/instrument/trumpet/spectral/Initialize() +/obj/item/instrument/trumpet/spectral/Initialize(mapload) . = ..() AddComponent(/datum/component/spooky) */ @@ -194,7 +194,7 @@ attack_verb = list("played", "jazzed", "saxed", "mourned", "dooted", "spooked") /* -/obj/item/instrument/saxophone/spectral/Initialize() +/obj/item/instrument/saxophone/spectral/Initialize(mapload) . = ..() AddComponent(/datum/component/spooky) */ @@ -217,7 +217,7 @@ attack_verb = list("played", "jazzed", "tromboneed", "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/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index cd2fc1fb5f..4b044822ab 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -17,7 +17,7 @@ var/detail_color = COLOR_ASSEMBLY_BLACK -/obj/item/electronic_assembly/Initialize() +/obj/item/electronic_assembly/Initialize(mapload) battery = new(src) START_PROCESSING(SSobj, src) return ..() diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm index 4c2627ed02..a03562c241 100644 --- a/code/modules/integrated_electronics/core/assemblies/clothing.dm +++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm @@ -89,7 +89,7 @@ icon_state = "circuitry" worn_state = "circuitry" -/obj/item/clothing/under/circuitry/Initialize() +/obj/item/clothing/under/circuitry/Initialize(mapload) setup_integrated_circuit(/obj/item/electronic_assembly/clothing) return ..() @@ -103,7 +103,7 @@ icon_state = "circuitry" item_state = "circuitry" -/obj/item/clothing/gloves/circuitry/Initialize() +/obj/item/clothing/gloves/circuitry/Initialize(mapload) setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() @@ -117,7 +117,7 @@ icon_state = "circuitry" item_state = "night" // The on-mob sprite would be identical anyways. -/obj/item/clothing/glasses/circuitry/Initialize() +/obj/item/clothing/glasses/circuitry/Initialize(mapload) setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() @@ -130,7 +130,7 @@ icon_state = "circuitry" item_state = "circuitry" -/obj/item/clothing/shoes/circuitry/Initialize() +/obj/item/clothing/shoes/circuitry/Initialize(mapload) setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() @@ -143,7 +143,7 @@ icon_state = "circuitry" item_state = "circuitry" -/obj/item/clothing/head/circuitry/Initialize() +/obj/item/clothing/head/circuitry/Initialize(mapload) setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() @@ -156,7 +156,7 @@ icon_state = "circuitry" item_state = "circuitry" -/obj/item/clothing/ears/circuitry/Initialize() +/obj/item/clothing/ears/circuitry/Initialize(mapload) setup_integrated_circuit(/obj/item/electronic_assembly/clothing/small) return ..() @@ -169,6 +169,6 @@ icon_state = "circuitry" item_state = "circuitry" -/obj/item/clothing/suit/circuitry/Initialize() +/obj/item/clothing/suit/circuitry/Initialize(mapload) setup_integrated_circuit(/obj/item/electronic_assembly/clothing/large) return ..() diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index d385387396..f4b06bdba6 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -25,7 +25,7 @@ "hot pink" = COLOR_ASSEMBLY_HOT_PINK ) -/obj/item/integrated_electronics/detailer/Initialize() +/obj/item/integrated_electronics/detailer/Initialize(mapload) update_icon() return ..() diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index fb58cf9471..3329d144bd 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -307,7 +307,7 @@ make_exact_fit() . = ..() -/obj/item/storage/bag/circuits/all/Initialize() +/obj/item/storage/bag/circuits/all/Initialize(mapload) new /obj/item/storage/bag/circuits/mini/arithmetic/all(src) new /obj/item/storage/bag/circuits/mini/trig/all(src) new /obj/item/storage/bag/circuits/mini/input/all(src) @@ -349,7 +349,7 @@ /obj/item/storage/bag/circuits/mini/arithmetic/all // Don't believe this will ever be needed. spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/arithmetic/Initialize() +/obj/item/storage/bag/circuits/mini/arithmetic/Initialize(mapload) for(var/obj/item/integrated_circuit/arithmetic/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -366,7 +366,7 @@ /obj/item/storage/bag/circuits/mini/trig/all // Ditto spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/trig/Initialize() +/obj/item/storage/bag/circuits/mini/trig/Initialize(mapload) for(var/obj/item/integrated_circuit/trig/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -383,7 +383,7 @@ /obj/item/storage/bag/circuits/mini/input/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/input/Initialize() +/obj/item/storage/bag/circuits/mini/input/Initialize(mapload) for(var/obj/item/integrated_circuit/input/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -400,7 +400,7 @@ /obj/item/storage/bag/circuits/mini/output/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/output/Initialize() +/obj/item/storage/bag/circuits/mini/output/Initialize(mapload) for(var/obj/item/integrated_circuit/output/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -417,7 +417,7 @@ /obj/item/storage/bag/circuits/mini/memory/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/memory/Initialize() +/obj/item/storage/bag/circuits/mini/memory/Initialize(mapload) for(var/obj/item/integrated_circuit/memory/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -434,7 +434,7 @@ /obj/item/storage/bag/circuits/mini/logic/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/logic/Initialize() +/obj/item/storage/bag/circuits/mini/logic/Initialize(mapload) for(var/obj/item/integrated_circuit/logic/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -451,7 +451,7 @@ /obj/item/storage/bag/circuits/mini/time/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/time/Initialize() +/obj/item/storage/bag/circuits/mini/time/Initialize(mapload) for(var/obj/item/integrated_circuit/time/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -468,7 +468,7 @@ /obj/item/storage/bag/circuits/mini/reagents/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/reagents/Initialize() +/obj/item/storage/bag/circuits/mini/reagents/Initialize(mapload) for(var/obj/item/integrated_circuit/reagent/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -485,7 +485,7 @@ /obj/item/storage/bag/circuits/mini/transfer/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/transfer/Initialize() +/obj/item/storage/bag/circuits/mini/transfer/Initialize(mapload) for(var/obj/item/integrated_circuit/transfer/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -502,7 +502,7 @@ /obj/item/storage/bag/circuits/mini/converter/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/converter/Initialize() +/obj/item/storage/bag/circuits/mini/converter/Initialize(mapload) for(var/obj/item/integrated_circuit/converter/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -518,7 +518,7 @@ /obj/item/storage/bag/circuits/mini/smart/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/smart/Initialize() +/obj/item/storage/bag/circuits/mini/smart/Initialize(mapload) for(var/obj/item/integrated_circuit/smart/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -534,7 +534,7 @@ /obj/item/storage/bag/circuits/mini/manipulation/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/manipulation/Initialize() +/obj/item/storage/bag/circuits/mini/manipulation/Initialize(mapload) for(var/obj/item/integrated_circuit/manipulation/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) @@ -551,7 +551,7 @@ /obj/item/storage/bag/circuits/mini/power/all spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH -/obj/item/storage/bag/circuits/mini/power/Initialize() +/obj/item/storage/bag/circuits/mini/power/Initialize(mapload) for(var/obj/item/integrated_circuit/passive/power/IC in all_integrated_circuits) if(IC.spawn_flags & spawn_flags_to_use) for(var/i = 1 to 4) diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 289fb3f66b..3554f5b6a1 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -213,7 +213,7 @@ var/obj/machinery/power/circuit_io/IO = null // Dummy power machine to move energy in/out without a bunch of code duplication. var/throughput = 10000 // Give/take up to 10kW. -/obj/item/integrated_circuit/passive/power/powernet/Initialize() +/obj/item/integrated_circuit/passive/power/powernet/Initialize(mapload) IO = new(src) return ..() diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 4fe4863c55..63eb744cf2 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -361,7 +361,7 @@ var/code = 30 var/datum/radio_frequency/radio_connection -/obj/item/integrated_circuit/input/signaler/Initialize() +/obj/item/integrated_circuit/input/signaler/Initialize(mapload) . = ..() set_pin_data(IC_INPUT, 1, frequency) set_pin_data(IC_INPUT, 2, code) @@ -596,7 +596,7 @@ LANGUAGE_SIGN ) -/obj/item/integrated_circuit/input/microphone/sign/Initialize() +/obj/item/integrated_circuit/input/microphone/sign/Initialize(mapload) . = ..() for(var/lang in readable_langs) var/datum/language/newlang = GLOB.all_languages[lang] diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index 6dde5356a9..0ac08eab1f 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -153,7 +153,7 @@ var/mob/living/voice/my_voice -/obj/item/integrated_circuit/output/text_to_speech/advanced/Initialize() +/obj/item/integrated_circuit/output/text_to_speech/advanced/Initialize(mapload) . = ..() my_voice = new (src) mob_list -= my_voice // no life() ticks @@ -446,7 +446,7 @@ // var/datum/beam/holo_beam = null // A visual effect, to make it easy to know where a hologram is coming from. // It is commented out due to picking up the assembly killing the beam. -/obj/item/integrated_circuit/output/holographic_projector/Initialize() +/obj/item/integrated_circuit/output/holographic_projector/Initialize(mapload) . = ..() AddComponent(/datum/component/recursive_move) RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(on_moved)) diff --git a/code/modules/library/hardcode_library/fiction/APsychonaut.dm b/code/modules/library/hardcode_library/fiction/APsychonaut.dm index 6ce896d908..e8e1730ec4 100644 --- a/code/modules/library/hardcode_library/fiction/APsychonaut.dm +++ b/code/modules/library/hardcode_library/fiction/APsychonaut.dm @@ -150,4 +150,4 @@ CATEGORY: Fiction - "}) \ No newline at end of file + "}) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 74d008d513..a88bbce010 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -20,7 +20,7 @@ density = TRUE opacity = 1 -/obj/structure/bookcase/Initialize() +/obj/structure/bookcase/Initialize(mapload) . = ..() for(var/obj/item/I in loc) if(istype(I, /obj/item/book)) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index d033c59684..b38b82a23f 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -139,7 +139,7 @@ var/static/list/base_genre_books -/obj/machinery/librarycomp/Initialize() +/obj/machinery/librarycomp/Initialize(mapload) . = ..() if(!base_genre_books || !base_genre_books.len) diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm index 220cfb995e..865dd28710 100644 --- a/code/modules/lighting/lighting_fake_sun_vr.dm +++ b/code/modules/lighting/lighting_fake_sun_vr.dm @@ -96,7 +96,7 @@ var/static/list/fake_sunlight_zs = list() . = ..() world_suns += src -/obj/effect/fake_sun/Initialize() +/obj/effect/fake_sun/Initialize(mapload) ..() if(!advanced_lighting) return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/looking_glass/lg_area.dm b/code/modules/looking_glass/lg_area.dm index 25d3bd7a3d..2000c35609 100644 --- a/code/modules/looking_glass/lg_area.dm +++ b/code/modules/looking_glass/lg_area.dm @@ -9,7 +9,7 @@ var/active = FALSE -/area/looking_glass/Initialize() +/area/looking_glass/Initialize(mapload) . = ..() our_landmark = locate() in src if(!our_landmark) diff --git a/code/modules/looking_glass/lg_console.dm b/code/modules/looking_glass/lg_console.dm index e3a9ec8204..4d0f44d36e 100644 --- a/code/modules/looking_glass/lg_console.dm +++ b/code/modules/looking_glass/lg_console.dm @@ -19,7 +19,7 @@ var/lg_id = "change_me" -/obj/machinery/computer/looking_glass/Initialize() +/obj/machinery/computer/looking_glass/Initialize(mapload) . = ..() for(var/area/looking_glass/lga in world) if(lga.lg_id == lg_id) diff --git a/code/modules/looking_glass/lg_imageholder.dm b/code/modules/looking_glass/lg_imageholder.dm index 0d4cf5b157..0f6f8bec8e 100644 --- a/code/modules/looking_glass/lg_imageholder.dm +++ b/code/modules/looking_glass/lg_imageholder.dm @@ -9,7 +9,7 @@ mouse_opacity = 0 -/obj/effect/landmark/looking_glass/Initialize() +/obj/effect/landmark/looking_glass/Initialize(mapload) . = ..() viewers = list() @@ -62,5 +62,5 @@ holding.loc = null holding = null - -#undef LG_IMAGE_SIZE \ No newline at end of file + +#undef LG_IMAGE_SIZE diff --git a/code/modules/lore_codex/codex.dm b/code/modules/lore_codex/codex.dm index f67ac887eb..a266a75b0f 100644 --- a/code/modules/lore_codex/codex.dm +++ b/code/modules/lore_codex/codex.dm @@ -11,7 +11,7 @@ var/static/list/codex_tree_keys = list() // static list linking codexes to the correct codex_tree. -/obj/item/book/codex/Initialize() +/obj/item/book/codex/Initialize(mapload) tree = codex_tree_keys["[root_type]"] if(!tree) tree = new(src, root_type) diff --git a/code/modules/makeup/nailpolish.dm b/code/modules/makeup/nailpolish.dm index a49126186b..80322329fc 100644 --- a/code/modules/makeup/nailpolish.dm +++ b/code/modules/makeup/nailpolish.dm @@ -13,7 +13,7 @@ drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' -/obj/item/nailpolish/Initialize() +/obj/item/nailpolish/Initialize(mapload) . = ..() desc = "Nail polish, " + initial(desc) top_underlay = image(icon, "top") diff --git a/code/modules/materials/fifty_spawner.dm b/code/modules/materials/fifty_spawner.dm index 9a7786ae21..1d1a6106a9 100644 --- a/code/modules/materials/fifty_spawner.dm +++ b/code/modules/materials/fifty_spawner.dm @@ -6,7 +6,7 @@ icon_state = "x4" var/obj/item/stack/type_to_spawn = null -/obj/fiftyspawner/Initialize() +/obj/fiftyspawner/Initialize(mapload) ..() var/turf/T = get_turf(src) var/obj/structure/closet/C = locate() in T @@ -16,4 +16,4 @@ /obj/fiftyspawner/rods name = "stack of rods" //this needs to be defined for cargo - type_to_spawn = /obj/item/stack/rods \ No newline at end of file + type_to_spawn = /obj/item/stack/rods diff --git a/code/modules/materials/material_synth.dm b/code/modules/materials/material_synth.dm index 03f5c74343..a5258d2ce0 100644 --- a/code/modules/materials/material_synth.dm +++ b/code/modules/materials/material_synth.dm @@ -6,7 +6,7 @@ gender = NEUTER matter = null // Don't shove it in the autholathe. -/obj/item/stack/material/cyborg/Initialize() +/obj/item/stack/material/cyborg/Initialize(mapload) . = ..() name = "[material.display_name] synthesiser" desc = "A device that synthesises [material.display_name]." diff --git a/code/modules/materials/sheets/_sheets.dm b/code/modules/materials/sheets/_sheets.dm index 9d9a548ede..6ef5cd196f 100644 --- a/code/modules/materials/sheets/_sheets.dm +++ b/code/modules/materials/sheets/_sheets.dm @@ -22,7 +22,7 @@ drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' -/obj/item/stack/material/Initialize() +/obj/item/stack/material/Initialize(mapload) . = ..() randpixel_xy() diff --git a/code/modules/materials/sheets/metals/rods.dm b/code/modules/materials/sheets/metals/rods.dm index 65eabac6aa..10131b2374 100644 --- a/code/modules/materials/sheets/metals/rods.dm +++ b/code/modules/materials/sheets/metals/rods.dm @@ -26,7 +26,7 @@ stacktype = /obj/item/stack/rods no_variants = TRUE -/obj/item/stack/rods/Initialize() +/obj/item/stack/rods/Initialize(mapload) . = ..() recipes = rods_recipes update_icon() diff --git a/code/modules/materials/sheets/organic/tanning/tanning_rack.dm b/code/modules/materials/sheets/organic/tanning/tanning_rack.dm index fdd0fce35e..7062cda41e 100644 --- a/code/modules/materials/sheets/organic/tanning/tanning_rack.dm +++ b/code/modules/materials/sheets/organic/tanning/tanning_rack.dm @@ -6,7 +6,7 @@ var/obj/item/stack/wetleather/drying = null -/obj/structure/tanning_rack/Initialize() +/obj/structure/tanning_rack/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) // SSObj fires ~every 2s , starting from wetness 30 takes ~1m @@ -64,4 +64,4 @@ update_icon() /obj/structure/tanning_rack/attack_robot(var/mob/user) - attack_hand(user) // That has checks to \ No newline at end of file + attack_hand(user) // That has checks to diff --git a/code/modules/media/juke_remote.dm b/code/modules/media/juke_remote.dm index 4091c0c5aa..58f8d5f46e 100644 --- a/code/modules/media/juke_remote.dm +++ b/code/modules/media/juke_remote.dm @@ -12,7 +12,7 @@ var/area/our_area /* -/obj/item/juke_remote/Initialize() +/obj/item/juke_remote/Initialize(mapload) . = ..() flags |= NOBLUDGEON */ diff --git a/code/modules/media/media_machinery.dm b/code/modules/media/media_machinery.dm index bbde62a347..f20fe2a442 100644 --- a/code/modules/media/media_machinery.dm +++ b/code/modules/media/media_machinery.dm @@ -64,11 +64,10 @@ if(anchored) update_music() -/obj/machinery/media/Initialize() +/obj/machinery/media/Initialize(mapload) . = ..() update_media_source() /obj/machinery/media/Destroy() disconnect_media_source() . = ..() - diff --git a/code/modules/mining/abandonedcrates_vr.dm b/code/modules/mining/abandonedcrates_vr.dm index 3e8946e643..20331ad460 100644 --- a/code/modules/mining/abandonedcrates_vr.dm +++ b/code/modules/mining/abandonedcrates_vr.dm @@ -172,7 +172,7 @@ /obj/item/capture_crystal ) -/obj/item/storage/backpack/sport/hyd/catchemall/Initialize() //gotta have your starter 'mon too (or an improved way to catch one) +/obj/item/storage/backpack/sport/hyd/catchemall/Initialize(mapload) //gotta have your starter 'mon too (or an improved way to catch one) . = ..() var/path = pick(subtypesof(/obj/item/capture_crystal)) contents += new path() diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 24cdacb445..d42c1405e0 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -104,7 +104,7 @@ if(capacity && current_capacity) . += "The drill currently has [current_capacity] capacity taken up and can fit [capacity - current_capacity] more ore." -/obj/machinery/mining/drill/Initialize() +/obj/machinery/mining/drill/Initialize(mapload) . = ..() if(ispath(cell)) cell = new cell(src) @@ -429,7 +429,7 @@ if(brace_tier >= 3) . += span_notice("The internals of the brace look resilient enough to support a drill by itself.") -/obj/machinery/mining/brace/Initialize() +/obj/machinery/mining/brace/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 7f4f3397a8..b54ee43a6e 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -158,7 +158,7 @@ var/global/list/total_extraction_beacons = list() 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)])" global.total_extraction_beacons += src diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm index cd2191f1e5..838089011d 100644 --- a/code/modules/mining/kinetic_crusher.dm +++ b/code/modules/mining/kinetic_crusher.dm @@ -65,7 +65,7 @@ AddElement(/datum/element/conflict_checking, CONFLICT_ELEMENT_CRUSHER) /* -/obj/item/kinetic_crusher/Initialize() +/obj/item/kinetic_crusher/Initialize(mapload) . = ..() if(requires_Wield) RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield)) diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm index a5a0c16795..bcf3a9a916 100644 --- a/code/modules/mining/machinery/machine_processing.dm +++ b/code/modules/mining/machinery/machine_processing.dm @@ -17,7 +17,7 @@ var/obj/machinery/mineral/processing_unit/machine = null var/show_all_ores = FALSE -/obj/machinery/mineral/processing_unit_console/Initialize() +/obj/machinery/mineral/processing_unit_console/Initialize(mapload) . = ..() src.machine = locate(/obj/machinery/mineral/processing_unit) in range(5, src) if (machine) @@ -187,7 +187,7 @@ ORE_VERDANTIUM = 60, ORE_RUTILE = 40) //VOREStation Add -/obj/machinery/mineral/processing_unit/Initialize() +/obj/machinery/mineral/processing_unit/Initialize(mapload) . = ..() for(var/ore in GLOB.ore_data) var/ore/OD = GLOB.ore_data[ore] diff --git a/code/modules/mining/machinery/machine_unloading.dm b/code/modules/mining/machinery/machine_unloading.dm index 5894f07cc1..0900a3c520 100644 --- a/code/modules/mining/machinery/machine_unloading.dm +++ b/code/modules/mining/machinery/machine_unloading.dm @@ -11,7 +11,7 @@ var/obj/machinery/mineral/output = null -/obj/machinery/mineral/unloading_machine/Initialize() +/obj/machinery/mineral/unloading_machine/Initialize(mapload) . = ..() for(var/dir in cardinal) input = locate(/obj/machinery/mineral/input, get_step(src, dir)) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index b563cd9a69..f2be48ccde 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -209,7 +209,7 @@ var/upright = 0 var/base_state -/obj/item/stack/flag/Initialize() +/obj/item/stack/flag/Initialize(mapload) . = ..() base_state = icon_state update_icon() diff --git a/code/modules/mining/mine_outcrops.dm b/code/modules/mining/mine_outcrops.dm index 04ee0439a5..da2d14e724 100644 --- a/code/modules/mining/mine_outcrops.dm +++ b/code/modules/mining/mine_outcrops.dm @@ -11,7 +11,7 @@ var/upperdrop = 10 var/outcropdrop = /obj/item/ore/glass -/obj/structure/outcrop/Initialize() +/obj/structure/outcrop/Initialize(mapload) . = ..() if(prob(1)) add_overlay("[initial(icon_state)]-egg") diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index c92c3c6487..74e406c031 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -204,7 +204,7 @@ var/list/mining_overlay_cache = list() //Cache hit return mining_overlay_cache["[cache_id]_[direction]"] -/turf/simulated/mineral/Initialize() +/turf/simulated/mineral/Initialize(mapload) . = ..() if(turf_resource_types & TURF_HAS_RARE_ORE) make_ore(1) diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 501cc6afcf..5d82ab3ab5 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -148,7 +148,7 @@ icon_state = "slag" material = null -/obj/item/ore/Initialize() +/obj/item/ore/Initialize(mapload) . = ..() randpixel_xy() diff --git a/code/modules/mining/resonator.dm b/code/modules/mining/resonator.dm index 5fa2d00f28..ee48cf0a13 100644 --- a/code/modules/mining/resonator.dm +++ b/code/modules/mining/resonator.dm @@ -99,7 +99,7 @@ layer = ABOVE_MOB_LAYER duration = 4 -/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 = 4) diff --git a/code/modules/mining/resonator_vr.dm b/code/modules/mining/resonator_vr.dm index e1e5e4ae1b..ff811194b1 100644 --- a/code/modules/mining/resonator_vr.dm +++ b/code/modules/mining/resonator_vr.dm @@ -163,7 +163,7 @@ layer = ABOVE_MOB_LAYER duration = 4 -/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 = 4) diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index 610c9b3a52..031765ac69 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -278,7 +278,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) pixel_y = -4 max_n_of_items = 100 -/obj/machinery/smartfridge/survival_pod/Initialize() +/obj/machinery/smartfridge/survival_pod/Initialize(mapload) . = ..() for(var/obj/item/O in loc) if(accept_check(O)) diff --git a/code/modules/mob/freelook/ai/eye.dm b/code/modules/mob/freelook/ai/eye.dm index dc8e3dde73..402218a71a 100644 --- a/code/modules/mob/freelook/ai/eye.dm +++ b/code/modules/mob/freelook/ai/eye.dm @@ -74,7 +74,7 @@ SetName(src.name) // Intiliaze the eye by assigning it's "ai" variable to us. Then set it's loc to us. -/mob/living/silicon/ai/Initialize() +/mob/living/silicon/ai/Initialize(mapload) . = ..() create_eyeobj() if(eyeobj) diff --git a/code/modules/mob/freelook/update_triggers.dm b/code/modules/mob/freelook/update_triggers.dm index 7252cc5443..f73e3b8d13 100644 --- a/code/modules/mob/freelook/update_triggers.dm +++ b/code/modules/mob/freelook/update_triggers.dm @@ -23,7 +23,7 @@ zone.rebuild() return ..() -/turf/simulated/Initialize() +/turf/simulated/Initialize(mapload) . = ..() updateVisibility(src) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index daeff8fdff..7f16a2fcf9 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -311,7 +311,7 @@ var/list/holder_mob_icon_cache = list() item_icons = null w_class = ITEMSIZE_SMALL -/obj/item/holder/bird/Initialize() +/obj/item/holder/bird/Initialize(mapload) . = ..() held_mob?.lay_down() diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index 9d7763e0a9..fbdc78d236 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -45,7 +45,7 @@ can_pain_emote = FALSE // CHOMPEdit: Sanity/safety, if bots ever get emotes later, undo this allow_mind_transfer = TRUE -/mob/living/bot/Initialize() +/mob/living/bot/Initialize(mapload) . = ..() //default_language = GLOB.all_languages[LANGUAGE_GALCOM] //VOREstation edit: moved to Init diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index a69f9e8c4e..86f0166914 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -19,7 +19,7 @@ var/blood = 1 var/list/target_types = list() -/mob/living/bot/cleanbot/Initialize() +/mob/living/bot/cleanbot/Initialize(mapload) . = ..() get_targets() diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index 5484f757dd..ef2d835cbf 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -528,7 +528,7 @@ var/skin = null //Same as medbot, set to tox or ointment for the respective kits. w_class = ITEMSIZE_NORMAL -/obj/item/firstaid_arm_assembly/Initialize() +/obj/item/firstaid_arm_assembly/Initialize(mapload) . = ..() if(skin) add_overlay("kit_skin_[src.skin]") diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index 6825b66479..66c8c4ea73 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -36,7 +36,7 @@ var/global/amount = 0 -/mob/living/bot/mulebot/Initialize() +/mob/living/bot/mulebot/Initialize(mapload) . = ..() var/turf/T = get_turf(loc) diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 09b8661b52..1fc159e3f8 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -22,7 +22,7 @@ var/adult_name var/instance_num -/mob/living/carbon/alien/Initialize() +/mob/living/carbon/alien/Initialize(mapload) . = ..() time_of_birth = world.time diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm index 434d02617b..08d2692a8d 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona.dm @@ -49,7 +49,7 @@ var/list/_nymph_default_emotes = list( /mob/living/carbon/alien/diona/get_available_emotes() return global._nymph_default_emotes.Copy() -/mob/living/carbon/alien/diona/Initialize() +/mob/living/carbon/alien/diona/Initialize(mapload) . = ..() species = GLOB.all_species[SPECIES_DIONA] add_language(LANGUAGE_ROOTGLOBAL) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index e69283a197..3c64771da7 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -10,7 +10,7 @@ faction = FACTION_XENO max_grown = 325 //Increase larva growth time due to not needing hosts. -/mob/living/carbon/alien/larva/Initialize() +/mob/living/carbon/alien/larva/Initialize(mapload) . = ..() add_language("Xenolingua") //Bonus language. CHOMPedit internal_organs |= new /obj/item/organ/internal/xenos/hivenode(src) diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index c392d01fa2..c77383bd21 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -12,7 +12,7 @@ can_pain_emote = FALSE // CHOMPEdit: Sanity/safety low_priority = TRUE //CHOMPEdit -/mob/living/carbon/brain/Initialize() +/mob/living/carbon/brain/Initialize(mapload) . = ..() var/datum/reagents/R = new/datum/reagents(1000) reagents = R diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e9eca25f34..1b84844675 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/Initialize() +/mob/living/carbon/Initialize(mapload) . = ..() //setup reagent holders bloodstr = new/datum/reagents/metabolism/bloodstream(500, src) diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm index 4119c2e8ed..1d9bfbdd17 100644 --- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm @@ -34,7 +34,7 @@ var/to_wear_l_hand = null var/to_wear_r_hand = /obj/item/melee/baton -/mob/living/carbon/human/ai_controlled/Initialize() +/mob/living/carbon/human/ai_controlled/Initialize(mapload) if(generate_gender) gender = pick(list(MALE, FEMALE, PLURAL, NEUTER)) @@ -143,7 +143,7 @@ to_wear_r_hand = null -/mob/living/carbon/human/ai_controlled/replicant/Initialize() +/mob/living/carbon/human/ai_controlled/replicant/Initialize(mapload) . = ..() name = species.get_random_name(gender) add_modifier(/datum/modifier/homeothermic, 0, null) diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 71702d7033..bbb84e3d41 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -4,7 +4,7 @@ has_huds = FALSE blocks_emissive = FALSE -/mob/living/carbon/human/dummy/Initialize() +/mob/living/carbon/human/dummy/Initialize(mapload) . = ..() mob_list -= src living_mob_list -= src @@ -18,7 +18,7 @@ human_mob_list -= src return -/mob/living/carbon/human/dummy/mannequin/Initialize() +/mob/living/carbon/human/dummy/mannequin/Initialize(mapload) . = ..() delete_inventory() @@ -27,7 +27,7 @@ icon_state = "preview" var/autorotate = TRUE -/mob/living/carbon/human/dummy/mannequin/autoequip/Initialize() +/mob/living/carbon/human/dummy/mannequin/autoequip/Initialize(mapload) icon = null icon_state = "" . = ..() diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm index 3aa2c1bd92..4995786a4b 100644 --- a/code/modules/mob/living/carbon/human/npcs.dm +++ b/code/modules/mob/living/carbon/human/npcs.dm @@ -6,7 +6,7 @@ has_sensor = 0 species_restricted = list("Monkey") -/mob/living/carbon/human/monkey/punpun/Initialize() +/mob/living/carbon/human/monkey/punpun/Initialize(mapload) . = ..() name = "Pun Pun" real_name = name diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm index 08d84e5a42..d1c20d660c 100644 --- a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm +++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm @@ -227,7 +227,7 @@ var/connected_mob var/area_name -/obj/structure/glamour_ring/Initialize() +/obj/structure/glamour_ring/Initialize(mapload) . = ..() var/area/A = get_area(src) area_name = A.name diff --git a/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm b/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm index a144abcd82..841566f43f 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/dark_portal_ch.dm @@ -79,7 +79,7 @@ GLOBAL_LIST_BOILERPLATE(all_darkportal_hubs, /obj/structure/dark_portal/hub) -/obj/structure/dark_portal/hub/Initialize() +/obj/structure/dark_portal/hub/Initialize(mapload) . = ..() locked = src locked_name = src.name diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm index 68cde365bb..926794a514 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_rig.dm @@ -434,7 +434,7 @@ charge_amount = 100 var/mob/living/carbon/human/charger -/obj/item/cell/protean/Initialize() +/obj/item/cell/protean/Initialize(mapload) . = ..() charge = maxcharge update_icon() diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm index bd1be6eeda..d5f6d727a8 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm @@ -43,7 +43,7 @@ plane = DIRTY_PLANE layer = DIRTY_LAYER -/obj/effect/weaversilk/floor/Initialize() +/obj/effect/weaversilk/floor/Initialize(mapload) . = ..() icon_state = pick(possible_icon_states) @@ -54,7 +54,7 @@ var/possible_icon_states = list("wallweb1", "wallweb2", "wallweb3") density = TRUE -/obj/effect/weaversilk/wall/Initialize() +/obj/effect/weaversilk/wall/Initialize(mapload) . = ..() icon_state = pick(possible_icon_states) diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index 27d214eb8b..f83d03e0d3 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -356,7 +356,7 @@ origin_tech = list(TECH_BIO = 4) var/grown = 0 -/obj/item/reagent_containers/food/snacks/egg/slime/Initialize() +/obj/item/reagent_containers/food/snacks/egg/slime/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4) reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 1) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 300ef01311..0f3b4ff236 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1018,7 +1018,7 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/announcer is_dummy = 1 -/mob/living/silicon/ai/announcer/Initialize() +/mob/living/silicon/ai/announcer/Initialize(mapload) . = ..() mob_list -= src living_mob_list -= src diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm index 5b34589e63..27effd765f 100644 --- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm +++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm @@ -1,7 +1,7 @@ /mob/living/silicon/ai var/mob/living/silicon/robot/deployed_shell = null //For shell control -/mob/living/silicon/ai/Initialize() +/mob/living/silicon/ai/Initialize(mapload) if(CONFIG_GET(flag/allow_ai_shells)) add_verb(src, /mob/living/silicon/ai/proc/deploy_to_shell_act) return ..() diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index ba3856d8e3..4283d9ca10 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/observer/eye/aiEye/pic_in_pic/aiEye -/obj/screen/movable/pic_in_pic/ai/Initialize() +/obj/screen/movable/pic_in_pic/ai/Initialize(mapload) . = ..() aiEye = new /mob/observer/eye/aiEye/pic_in_pic() aiEye.screen = src @@ -149,7 +149,7 @@ Whatever you did that made the last camera window disappear-- don't do that agai plane = SPACE_PLANE layer = AREA_LAYER + 0.1 -/turf/unsimulated/ai_visible/Initialize() +/turf/unsimulated/ai_visible/Initialize(mapload) . = ..() /area/ai_multicam_room @@ -164,7 +164,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) name = "ai camera room" 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/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index bb9a3615aa..a5818ee494 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -70,7 +70,7 @@ vore_capacity = 1 vore_capacity_ex = list("stomach" = 1) -/mob/living/silicon/pai/Initialize() +/mob/living/silicon/pai/Initialize(mapload) . = ..() add_verb(src, /mob/proc/dominate_predator) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index dab6801a16..2dc9158ef6 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -34,7 +34,7 @@ var/global/list/default_pai_software = list() default_pai_software[P.id] = P return r -/mob/living/silicon/pai/Initialize() +/mob/living/silicon/pai/Initialize(mapload) . = ..() software = default_pai_software.Copy() diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index b514227c41..7584985777 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -235,7 +235,7 @@ "analyser_broken", "radio_broken") -/obj/item/broken_device/random/Initialize() +/obj/item/broken_device/random/Initialize(mapload) icon_state = pick(possible_icons) . = ..() diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 338dd256a9..39352f4405 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -500,7 +500,7 @@ var/mob/living/silicon/robot/R var/last_robot_loc -/obj/item/reagent_containers/glass/beaker/large/borg/Initialize() +/obj/item/reagent_containers/glass/beaker/large/borg/Initialize(mapload) . = ..() R = loc.loc RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(check_loc)) diff --git a/code/modules/mob/living/silicon/robot/drone/swarm.dm b/code/modules/mob/living/silicon/robot/drone/swarm.dm index e39a3e641c..36add9e0d8 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm.dm @@ -57,7 +57,7 @@ /spell/aoe_turf/conjure/swarmer/melee ) -/mob/living/silicon/robot/drone/swarm/Initialize() +/mob/living/silicon/robot/drone/swarm/Initialize(mapload) . = ..() add_language(LANGUAGE_SWARMBOT, 1) diff --git a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm index f6610656cf..39769098ad 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm @@ -157,6 +157,6 @@ list(mode_name="deter", projectile_type=/obj/item/projectile/beam/shock, charge_cost = 175), ) -/obj/item/gun/energy/xray/swarm/Initialize() +/obj/item/gun/energy/xray/swarm/Initialize(mapload) . = ..() adjust_scale(-1, 1) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 043b6c3f94..dbd5799095 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -133,7 +133,7 @@ var/dummy_card = null var/dummy_card_type = /obj/item/card/id/science/roboticist/dummy_cyborg -/obj/item/card/robot/Initialize() +/obj/item/card/robot/Initialize(mapload) . = ..() dummy_card = new dummy_card_type(src) @@ -151,7 +151,7 @@ /obj/item/card/id/science/roboticist/dummy_cyborg access = list(access_robotics) -/obj/item/card/id/syndicate/dummy_cyborg/Initialize() +/obj/item/card/id/syndicate/dummy_cyborg/Initialize(mapload) . = ..() access |= access_robotics diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm index 8520448d5a..d52820b3cb 100644 --- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm +++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) var/first_transfer = TRUE // Premade AI shell, for roundstart shells. -/mob/living/silicon/robot/ai_shell/Initialize() +/mob/living/silicon/robot/ai_shell/Initialize(mapload) add_verb(src,/mob/living/silicon/robot/proc/transfer_shell_act) //CHOMPEdit TGPanel //CHOMPEDIT: add sideloader mmi = new /obj/item/mmi/inert/ai_remote(src) post_mmi_setup() @@ -230,7 +230,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells) icon_state = "x3" delete_me = TRUE -/obj/effect/landmark/free_ai_shell/Initialize() +/obj/effect/landmark/free_ai_shell/Initialize(mapload) if(CONFIG_GET(flag/allow_ai_shells) && CONFIG_GET(flag/give_free_ai_shell)) new /mob/living/silicon/robot/ai_shell(get_turf(src)) return ..() diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm index 15cc89eaf5..47b6252434 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -8,7 +8,7 @@ delete_me = TRUE var/platform_type -/obj/effect/landmark/robot_platform/Initialize() +/obj/effect/landmark/robot_platform/Initialize(mapload) if(platform_type) new platform_type(get_turf(src)) return ..() diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm index 7331382326..26a52d763b 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_subtypes.dm @@ -4,7 +4,7 @@ modtype = "Recon" module = /obj/item/robot_module/robot/platform/explorer -/mob/living/silicon/robot/platform/explorer/Initialize() +/mob/living/silicon/robot/platform/explorer/Initialize(mapload) . = ..() laws = new /datum/ai_laws/explorer diff --git a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm index 20bd5e5bd8..b5daa89dc3 100644 --- a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm @@ -35,7 +35,7 @@ parent = new_parent return ..() -/obj/effect/overmap/visitable/simplemob/Initialize() +/obj/effect/overmap/visitable/simplemob/Initialize(mapload) . = ..() if(!parent_mob_type && !parent) log_and_message_admins("An improperly configured OM mob event tried to spawn, and was deleted.") @@ -144,7 +144,7 @@ child_om_marker = new_child return ..() -/mob/living/simple_mob/vore/overmap/Initialize() +/mob/living/simple_mob/vore/overmap/Initialize(mapload) . = ..() if(!om_child_type) log_and_message_admins("An improperly configured OM mob tried to spawn, and was deleted.") @@ -177,7 +177,7 @@ parent = new_parent return ..() -/obj/effect/overmap/visitable/ship/simplemob/Initialize() +/obj/effect/overmap/visitable/ship/simplemob/Initialize(mapload) . = ..() if(!parent_mob_type && !parent) log_and_message_admins("An improperly configured OM mob event tried to spawn, and was deleted.") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index f667cebca8..fe039d2366 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -138,7 +138,7 @@ wander = TRUE belly_attack = FALSE -/mob/living/simple_mob/vore/alienanimals/catslug/Initialize() +/mob/living/simple_mob/vore/alienanimals/catslug/Initialize(mapload) . = ..() add_verb(src, /mob/living/proc/ventcrawl) add_verb(src, /mob/living/proc/hide) @@ -359,7 +359,7 @@ var/siemens_coefficient = 1 //Referenced later by others. can_wear_hat = FALSE -/mob/living/simple_mob/vore/alienanimals/catslug/custom/Initialize() +/mob/living/simple_mob/vore/alienanimals/catslug/custom/Initialize(mapload) . = ..() add_verb(src, /mob/living/proc/ventcrawl) add_verb(src, /mob/living/proc/hide) @@ -765,7 +765,7 @@ /obj/item/holder/catslug/custom/capslug item_state = "capslug" -/mob/living/simple_mob/vore/alienanimals/catslug/custom/capslug/Initialize() //This is such an awful proc, but if someone wants it better they're welcome to have a go at it. +/mob/living/simple_mob/vore/alienanimals/catslug/custom/capslug/Initialize(mapload) //This is such an awful proc, but if someone wants it better they're welcome to have a go at it. . = ..() mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = PUB_FREQ @@ -809,7 +809,7 @@ player_msg = "You work in the service of corporate Asset Protection, answering directly to the Board of Directors and Asset Protection Commandos." -/mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/deathslug/Initialize() +/mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/deathslug/Initialize(mapload) . = ..() mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = DTH_FREQ //Can't tell if bugged, deathsquad freq in general seems broken @@ -850,7 +850,7 @@ player_msg = "You are in the employ of a criminal syndicate hostile to corporate interests. Follow the Mercenary or Commando's orders and assist them in their goals by any means available." -/mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/syndislug/Initialize() +/mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/syndislug/Initialize(mapload) . = ..() mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = SYND_FREQ @@ -894,7 +894,7 @@ If you are confused or at a loss, always adminhelp, and before taking extreme actions, please try to also contact the administration! \ Think through your actions and make the roleplay immersive! Please remember all rules aside from those without explicit exceptions apply to the ERT." -/mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/responseslug/Initialize() +/mob/living/simple_mob/vore/alienanimals/catslug/custom/spaceslug/responseslug/Initialize(mapload) . = ..() mob_radio = new /obj/item/radio/headset/mob_headset(src) mob_radio.frequency = ERT_FREQ @@ -916,7 +916,7 @@ can_wear_hat = TRUE -/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug/Initialize() +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug/Initialize(mapload) . = ..() if(prob(25)) var/list/possible_targets = list() @@ -1116,7 +1116,7 @@ /mob/living/simple_mob/vore/alienanimals/catslug/suslug/impostor is_impostor = TRUE -/mob/living/simple_mob/vore/alienanimals/catslug/suslug/Initialize() +/mob/living/simple_mob/vore/alienanimals/catslug/suslug/Initialize(mapload) . = ..() add_verb(src, /mob/living/simple_mob/vore/alienanimals/catslug/suslug/proc/assussinate) update_icon() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm index de99206b8c..e9b2985fc6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -168,7 +168,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) inherited_nutriment = inherit . = ..() -/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize() +/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize(mapload) nutriment_amt += inherited_nutriment . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, nutriment_amt, nutriment_desc) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm index e063d1ed6b..33e5db7c53 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm @@ -64,7 +64,7 @@ B.digest_burn = 50 B.escapechance = 0 -/mob/living/simple_mob/vore/overmap/spacewhale/Initialize() +/mob/living/simple_mob/vore/overmap/spacewhale/Initialize(mapload) . = ..() handle_restless() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm index e99094da2d..667c0c9718 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm @@ -191,7 +191,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee/space_ghost -/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Initialize() +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Initialize(mapload) . = ..() icon_living = "spookyghost-[rand(1,2)]" icon_state = icon_living diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm index c879211b80..abb7e99538 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm @@ -152,7 +152,7 @@ return //If it can do normal vore mechanics, it can carry players to the OM, //and release them there. I think that's probably a bad idea. -/mob/living/simple_mob/vore/overmap/stardog/Initialize() +/mob/living/simple_mob/vore/overmap/stardog/Initialize(mapload) . = ..() child_om_marker.set_light(5, 1, "#ff8df5") @@ -429,7 +429,7 @@ icon_state = "furX" tree_chance = 0 -/turf/simulated/floor/outdoors/fur/Initialize() +/turf/simulated/floor/outdoors/fur/Initialize(mapload) . = ..() if(tree_chance && prob(tree_chance) && !check_density()) var/obj/structure/flora/tree/tree = new tree_type(src) @@ -1102,14 +1102,14 @@ icon = 'icons/obj/landmark_vr.dmi' icon_state = "transition" -/obj/effect/landmark/stardog/Initialize() +/obj/effect/landmark/stardog/Initialize(mapload) . = ..() var/area/a = get_area(src) name = a.name /obj/effect/landmark/area_gatherer name = "stardog area gatherer" -/obj/effect/landmark/area_gatherer/Initialize() +/obj/effect/landmark/area_gatherer/Initialize(mapload) . = ..() LateInitialize() @@ -1246,7 +1246,7 @@ if(L.client) to_chat(L, span_notice("A hot breath rushes up from under your feet, before the air rushes back down into the dog's nose as the dog sniffs you! SNEEF SNEEF!!!")) -/obj/effect/dog_eye/Initialize() +/obj/effect/dog_eye/Initialize(mapload) . = ..() var/area/redgate/stardog/eyes/e = get_area(src) if(istype(e,/area/redgate/stardog/eyes)) @@ -1270,7 +1270,7 @@ var/check_keys = FALSE var/check_prefs = TRUE -/obj/effect/dog_teleporter/Initialize() +/obj/effect/dog_teleporter/Initialize(mapload) . = ..() dog_teleporters |= src do_setup() @@ -1632,7 +1632,7 @@ ) var/faction = FACTION_MACROBACTERIA -/obj/structure/auto_flesh_door/Initialize() +/obj/structure/auto_flesh_door/Initialize(mapload) . = ..() countdown = rand(50,250) START_PROCESSING(SSobj, src) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index f69dd63251..1c3ab41ab9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -331,7 +331,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? ///////////////////////////////////////Other stuff/////////////////////////////////////////// -/mob/living/simple_mob/vore/alienanimals/teppi/Initialize() +/mob/living/simple_mob/vore/alienanimals/teppi/Initialize(mapload) . = ..() if(name == initial(name)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index a76cdd148a..6dd89561c7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -56,7 +56,7 @@ if(antag && mind) borers.add_antagonist(mind) -/mob/living/simple_mob/animal/borer/Initialize() +/mob/living/simple_mob/animal/borer/Initialize(mapload) add_language("Cortical Link") add_verb(src, /mob/living/proc/ventcrawl) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother_spawn.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother_spawn.dm index 9550d2c324..fcccd74641 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother_spawn.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother_spawn.dm @@ -7,7 +7,7 @@ movement_cooldown = 3 -/mob/living/simple_mob/animal/giant_spider/frost/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/frost/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -28,7 +28,7 @@ movement_cooldown = -1 -/mob/living/simple_mob/animal/giant_spider/electric/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/electric/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -46,7 +46,7 @@ movement_cooldown = 0 -/mob/living/simple_mob/animal/giant_spider/hunter/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/hunter/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -64,7 +64,7 @@ movement_cooldown = 0 -/mob/living/simple_mob/animal/giant_spider/lurker/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/lurker/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -83,7 +83,7 @@ movement_cooldown = 3 ai_holder_type = /datum/ai_holder/simple_mob/melee -/mob/living/simple_mob/animal/giant_spider/nurse/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/nurse/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -101,7 +101,7 @@ movement_cooldown = 3 -/mob/living/simple_mob/animal/giant_spider/pepper/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/pepper/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -122,7 +122,7 @@ movement_cooldown = 1 -/mob/living/simple_mob/animal/giant_spider/thermic/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/thermic/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -140,7 +140,7 @@ movement_cooldown = 1 -/mob/living/simple_mob/animal/giant_spider/tunneler/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/tunneler/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -160,7 +160,7 @@ movement_cooldown = 1.5 -/mob/living/simple_mob/animal/giant_spider/webslinger/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/webslinger/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES) @@ -183,7 +183,7 @@ var/deathtimer -/mob/living/simple_mob/animal/giant_spider/broodling/Initialize() +/mob/living/simple_mob/animal/giant_spider/broodling/Initialize(mapload) . = ..() adjust_scale(0.75) deathtimer = addtimer(CALLBACK(src, PROC_REF(death)), 2 MINUTES, TIMER_STOPPABLE) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm index 67b1376f75..f2c4da7108 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm @@ -39,7 +39,7 @@ var/swarmling_type = /mob/living/simple_mob/animal/giant_spider/hunter var/swarmling_prob = 10 // Odds that a spiderling will be a swarmling instead. -/mob/living/simple_mob/animal/giant_spider/carrier/Initialize() +/mob/living/simple_mob/animal/giant_spider/carrier/Initialize(mapload) spiderling_count = rand(5, 10) adjust_scale(1.2) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm index 8626170c99..9b45959ce5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm @@ -29,6 +29,6 @@ poison_per_bite = 5 poison_type = REAGENT_ID_CONDENSEDCAPSAICINV -/mob/living/simple_mob/animal/giant_spider/pepper/Initialize() +/mob/living/simple_mob/animal/giant_spider/pepper/Initialize(mapload) adjust_scale(1.1) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm index 4c464b8d41..de2fc92331 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm @@ -59,7 +59,7 @@ var/explosion_delay_lower = 1 SECOND // Lower bound for explosion delay. var/explosion_delay_upper = 2 SECONDS // Upper bound. -/mob/living/simple_mob/animal/giant_spider/phorogenic/Initialize() +/mob/living/simple_mob/animal/giant_spider/phorogenic/Initialize(mapload) adjust_scale(1.25) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm index a56d60f5b7..9a914a1d9f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo_ch.dm @@ -122,7 +122,7 @@ desc = "A small, armored mammal. It seems to be territorial and protective of the dorms." ai_holder_type = /datum/ai_holder/simple_mob/armadillo/torta -/mob/living/simple_mob/animal/passive/armadillo/torta/Initialize() +/mob/living/simple_mob/animal/passive/armadillo/torta/Initialize(mapload) . = ..() if(!hat) hat = new /obj/item/clothing/head/sombrero diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm index 62a5960800..5096658fa1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm @@ -48,7 +48,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/sif_crab) -/mob/living/simple_mob/animal/passive/crab/sif/Initialize() +/mob/living/simple_mob/animal/passive/crab/sif/Initialize(mapload) . = ..() adjust_scale(rand(5,12) / 10) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm index 2e29fd8035..ea5354da22 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm @@ -36,7 +36,7 @@ var/randomize_location = TRUE -/mob/living/simple_mob/animal/passive/fish/Initialize() +/mob/living/simple_mob/animal/passive/fish/Initialize(mapload) . = ..() if(!default_pixel_x && randomize_location) @@ -176,7 +176,7 @@ var/image/dorsal_image var/image/belly_image -/mob/living/simple_mob/animal/passive/fish/icebass/Initialize() +/mob/living/simple_mob/animal/passive/fish/icebass/Initialize(mapload) . = ..() dorsal_color = rgb(rand(min_red,max_red), rand(min_green,max_green), rand(min_blue,max_blue)) belly_color = rgb(rand(min_red,max_red), rand(min_green,max_green), rand(min_blue,max_blue)) @@ -250,7 +250,7 @@ meat_type = /obj/item/reagent_containers/food/snacks/carpmeat/fish/sif -/mob/living/simple_mob/animal/passive/fish/rockfish/Initialize() +/mob/living/simple_mob/animal/passive/fish/rockfish/Initialize(mapload) . = ..() head_color = rgb(rand(min_red,max_red), rand(min_green,max_green), rand(min_blue,max_blue)) update_icon() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm index 800236dec2..14657cfa7d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm @@ -4,7 +4,7 @@ maxHealth = 50 meat_amount = 0 -/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize() +/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize(mapload) . = ..() create_reagents(60) reagents.add_reagent(REAGENT_ID_TOXIN, 45) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm index ecb6765c3f..4c6974ef63 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm @@ -27,7 +27,7 @@ var/body_color // Green, red, orange, yellow or cyan. Keep blank for random (including rare redblue) -/mob/living/simple_mob/animal/passive/lizard/Initialize() +/mob/living/simple_mob/animal/passive/lizard/Initialize(mapload) .=..() if(!body_color) @@ -54,7 +54,7 @@ attack_sharp = TRUE -/mob/living/simple_mob/animal/passive/lizard/large/Initialize() +/mob/living/simple_mob/animal/passive/lizard/large/Initialize(mapload) . = ..() adjust_scale(rand(12, 20) / 10) /mob/living/simple_mob/animal/passive/lizard/large/defensive diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 4968bc3ff6..38d946b8b5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -53,7 +53,7 @@ pain_emote_1p = list("squeaks", "squiks") // CHOMP Addition: Pain/etc sounds //CHOMPEdit Start -/mob/living/simple_mob/animal/passive/mouse/Initialize() +/mob/living/simple_mob/animal/passive/mouse/Initialize(mapload) . = ..() ghostjoin = 1 ghostjoin_icon() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm index 614ec0d87f..f4675d91cb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm @@ -12,7 +12,7 @@ /obj/item/animal_spawner var/critter_type = /mob/living/simple_mob/animal/passive/mouse -/obj/item/animal_spawner/Initialize() +/obj/item/animal_spawner/Initialize(mapload) ..() var/mob/living/simple_mob/critter = critter_type @@ -183,7 +183,7 @@ else icon_state = icon_living -/mob/living/simple_mob/animal/passive/opossum/Initialize() +/mob/living/simple_mob/animal/passive/opossum/Initialize(mapload) . = ..() add_verb(src, /mob/living/proc/ventcrawl) add_verb(src, /mob/living/proc/hide) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm index 179837f598..ff878ff7e7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/raccoon_ch.dm @@ -37,7 +37,7 @@ pain_emote_1p = list("chitter") pain_emote_3p = list("chitters") -/mob/living/simple_mob/animal/passive/raccoon_ch/Initialize() +/mob/living/simple_mob/animal/passive/raccoon_ch/Initialize(mapload) . = ..() ghostjoin = 1 ghostjoin_icon() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index cb377b2fd8..26317b075c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -52,7 +52,7 @@ var/list/_cat_default_emotes = list( var/named = FALSE //have I been named yet? var/friend_name = null //VOREStation Edit - Lock befriending to this character -/mob/living/simple_mob/animal/passive/cat/Initialize() +/mob/living/simple_mob/animal/passive/cat/Initialize(mapload) icon_living = "[initial(icon_state)]" icon_dead = "[initial(icon_state)]_dead" icon_rest = "[initial(icon_state)]_rest" @@ -147,7 +147,7 @@ var/list/_cat_default_emotes = list( gender = NEUTER holder_type = /obj/item/holder/cat/kitten //VOREStation Edit -/mob/living/simple_mob/animal/passive/cat/kitten/Initialize() +/mob/living/simple_mob/animal/passive/cat/kitten/Initialize(mapload) if(gender == NEUTER) gender = pick(MALE, FEMALE) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm index 453645b19b..424c491543 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm @@ -21,7 +21,7 @@ name = "faux" desc = "Domesticated fennec. Seems to like screaming just as much though." -/mob/living/simple_mob/animal/passive/fennec/Initialize() +/mob/living/simple_mob/animal/passive/fennec/Initialize(mapload) icon_living = "[initial(icon_state)]" icon_dead = "[initial(icon_state)]_dead" icon_rest = "[initial(icon_state)]_rest" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm index a3ee2fcc9a..aab55f9795 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm @@ -94,7 +94,7 @@ if(my_headset) . += "It is wearing \a [my_headset]." -/mob/living/simple_mob/animal/passive/bird/parrot/Initialize() +/mob/living/simple_mob/animal/passive/bird/parrot/Initialize(mapload) if(my_headset) my_headset = new my_headset(src) return ..() @@ -135,7 +135,7 @@ icon_dead = "eclectus-dead" tt_desc = "E Eclectus roratus" -/mob/living/simple_mob/animal/passive/bird/parrot/eclectus/Initialize() +/mob/living/simple_mob/animal/passive/bird/parrot/eclectus/Initialize(mapload) gender = pick(MALE, FEMALE) if(gender == FEMALE) icon_state = "eclectusf" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm index 67ffca932b..0560899f49 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm @@ -84,7 +84,7 @@ /mob/living/simple_mob/animal/sif/frostfly/get_cold_protection() return 1 // It literally produces a cryogenic mist inside itself. Cold doesn't bother it. -/mob/living/simple_mob/animal/sif/frostfly/Initialize() +/mob/living/simple_mob/animal/sif/frostfly/Initialize(mapload) . = ..() smoke_special = new add_verb(src, /mob/living/proc/ventcrawl) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm index f8b2b6bec2..b99280eae9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm @@ -63,7 +63,7 @@ say_list_type = /datum/say_list/glitterfly ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/glitterfly -/mob/living/simple_mob/animal/sif/glitterfly/Initialize() +/mob/living/simple_mob/animal/sif/glitterfly/Initialize(mapload) . = ..() var/colorlist = list(rgb(rand(100,255), rand(100,255), rand(100,255)) = 10, rgb(rand(5,100), rand(5,100), rand(5,100)) = 2, "#222222" = 1) color = pickweight(colorlist) @@ -86,7 +86,7 @@ plane = PLANE_LIGHTING_ABOVE -/mob/living/simple_mob/animal/sif/glitterfly/rare/Initialize() +/mob/living/simple_mob/animal/sif/glitterfly/rare/Initialize(mapload) . = ..() /mob/living/simple_mob/animal/sif/glitterfly/unique_tame_check(var/obj/O, var/mob/user) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm index 4897c12503..ba1f3b3a44 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm @@ -239,7 +239,7 @@ var/global/list/wounds_being_tended_by_drakes = list() // Other animals just need to be injured. return (friend.health < friend.maxHealth) -/mob/living/simple_mob/animal/sif/grafadreka/Initialize() +/mob/living/simple_mob/animal/sif/grafadreka/Initialize(mapload) charisma = rand(5, 15) stored_sap = rand(20, 30) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm index 1306143eb1..a2fdb4df17 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm @@ -95,7 +95,7 @@ health = 250 instinct = 50 -/mob/living/simple_mob/animal/sif/kururak/Initialize() +/mob/living/simple_mob/animal/sif/kururak/Initialize(mapload) . = ..() if(!instinct) if(prob(20)) @@ -334,7 +334,7 @@ else remove_modifiers_of_type(/datum/modifier/ace) -/mob/living/simple_mob/animal/sif/kururak/hibernate/Initialize() +/mob/living/simple_mob/animal/sif/kururak/hibernate/Initialize(mapload) . = ..() lay_down() instinct = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm index 6b6a45b091..820586bf82 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm @@ -116,7 +116,7 @@ emote_see = list("vibrates","looks around", "stares", "extends a proboscis") emote_hear = list("chitters", "clicks", "gurgles") -/mob/living/simple_mob/animal/sif/leech/Initialize() +/mob/living/simple_mob/animal/sif/leech/Initialize(mapload) . = ..() add_verb(src, /mob/living/proc/ventcrawl) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm index 5c59c2b7b1..67c9b1c2ef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm @@ -116,7 +116,7 @@ return FALSE -/mob/living/simple_mob/animal/sif/tymisian/Initialize() +/mob/living/simple_mob/animal/sif/tymisian/Initialize(mapload) . = ..() smoke_spore = new add_verb(src, /mob/living/proc/ventcrawl) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index aa4705224b..a7121a1660 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -156,7 +156,7 @@ I.appearance_flags = RESET_COLOR add_overlay(I) -/mob/living/simple_mob/animal/sif/sakimm/Initialize() +/mob/living/simple_mob/animal/sif/sakimm/Initialize(mapload) . = ..() add_verb(src, /mob/living/proc/ventcrawl) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm index 1f9db2544b..2ede1dad86 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm @@ -93,7 +93,7 @@ // Variant that automatically commands nearby allies to follow it when created. // Suggested to spawn last so it can rally up all the shantaks easily before hunting for tasty explorers. -/mob/living/simple_mob/animal/sif/shantak/leader/autofollow/Initialize() +/mob/living/simple_mob/animal/sif/shantak/leader/autofollow/Initialize(mapload) rally_pack() return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm index 9b724ad8b6..7e355d3f41 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm @@ -179,7 +179,7 @@ mob_class = MOB_CLASS_PHOTONIC // Xeno-taser won't work on this as its not a 'real' carp. -/mob/living/simple_mob/animal/space/carp/holographic/Initialize() +/mob/living/simple_mob/animal/space/carp/holographic/Initialize(mapload) set_light(2) // Hologram lighting. return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm index c6ebacbc76..02426e5241 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm @@ -220,7 +220,7 @@ nutriment_amt = 1 nutriment_desc = list(REAGENT_ID_SUGAR = 1) -/obj/item/reagent_containers/food/snacks/snakesnack/Initialize() +/obj/item/reagent_containers/food/snacks/snakesnack/Initialize(mapload) . = ..() if(!snack_colour) snack_colour = pick( list("yellow","green","pink","blue") ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm index 373f3d4233..51889a01a0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm @@ -111,7 +111,7 @@ if(stat) icon_state = "[icon_state]_dead" -/mob/living/simple_mob/animal/space/space_worm/head/Initialize() +/mob/living/simple_mob/animal/space/space_worm/head/Initialize(mapload) . = ..() var/mob/living/simple_mob/animal/space/space_worm/current = src diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index dce0e4a34e..07ebc0f7bc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -152,7 +152,7 @@ say_maybe_target = list("Sqk?") say_got_target = list("SQUEAK!!!") -/mob/living/simple_mob/vore/squirrel/Initialize() +/mob/living/simple_mob/vore/squirrel/Initialize(mapload) . = ..() if(do_seasons) switch(GLOB.world_time_season) // CHOMPEdit - Managed Globals @@ -228,6 +228,6 @@ /mob/living/simple_mob/vore/squirrel/big do_seasons = FALSE -/mob/living/simple_mob/vore/squirrel/big/Initialize() +/mob/living/simple_mob/vore/squirrel/big/Initialize(mapload) . = ..() winterize() diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid_ch.dm index 8abf4fe5e1..aea8983bb7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid_ch.dm @@ -3,7 +3,3 @@ pain_emote_1p = list("shout out in pain", "growl in pain", "grunt in pain", "gasp out in pain") pain_emote_3p = list("shouts out in pain", "growls in pain", "grunts in pain", "gasps out in pain") species_sounds = "Human Male" // Yes, we should allow them to differ based on gender, but if someone's making a custom humanoid later:tm: - set your humanoid's species_sounds to match, or var-edit it after spawn. - -/mob/living/simple_mob/humanoid/Initialize() - - . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm index eb3a5af253..19a1124a36 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm @@ -69,7 +69,7 @@ icon = 'modular_chomp/icons/mob/animal_ch.dmi' catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/human) -/mob/living/simple_mob/humanoid/merc/Initialize() +/mob/living/simple_mob/humanoid/merc/Initialize(mapload) . = ..() loot_list += list(/obj/item/salvage/loot/syndicate = 10) diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm index 9021d9e506..692f43dd41 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm @@ -49,7 +49,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/merc say_list_type = /datum/say_list/pirate -/mob/living/simple_mob/humanoid/pirate/Initialize() +/mob/living/simple_mob/humanoid/pirate/Initialize(mapload) . = ..() loot_list += list(/obj/item/salvage/loot/pirate = 35) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm index 8325667df1..ecb9a8720c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm @@ -67,7 +67,7 @@ icon_dead = "droneM_dead" ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run -/mob/living/simple_mob/mechanical/combat_drone/Initialize() +/mob/living/simple_mob/mechanical/combat_drone/Initialize(mapload) ion_trail = new ion_trail.set_up(src) ion_trail.start() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm index d4d619fbb8..89b69b918f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm @@ -69,7 +69,7 @@ var/ignoreunarmed = TRUE var/allowedtools = list(/obj/item/pickaxe, /obj/item/gun/energy/kinetic_accelerator, /obj/item/gun/magnetic/matfed/phoronbore, /obj/item/kinetic_crusher, /obj/item/melee/shock_maul) -/mob/living/simple_mob/mechanical/mining_drone/Initialize() +/mob/living/simple_mob/mechanical/mining_drone/Initialize(mapload) ion_trail = new ion_trail.set_up(src) ion_trail.start() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm index 439b50bf63..9288734be4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm @@ -57,7 +57,7 @@ "haste" = /obj/item/spell/modifier/haste ) -/mob/living/simple_mob/mechanical/technomancer_golem/Initialize() +/mob/living/simple_mob/mechanical/technomancer_golem/Initialize(mapload) core = new(src) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm index f1e0f49a72..8bab2b41be 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm @@ -47,7 +47,7 @@ // Variant that automatically commands nearby allies to follow it when created. // Useful to avoid having to manually set follow to a lot of hivebots that are gonna die in the next minute anyways. -/mob/living/simple_mob/mechanical/hivebot/support/commander/autofollow/Initialize() +/mob/living/simple_mob/mechanical/hivebot/support/commander/autofollow/Initialize(mapload) for(var/mob/living/L in hearers(7, src)) if(!L.ai_holder) continue diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm index b7ac603750..1cc72cfd87 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/durand.dm @@ -65,7 +65,7 @@ set_defense_mode(!defense_mode) // Variant that starts in defense mode, perhaps for PoIs. -/mob/living/simple_mob/mechanical/mecha/combat/durand/defensive/Initialize() +/mob/living/simple_mob/mechanical/mecha/combat/durand/defensive/Initialize(mapload) set_defense_mode(TRUE) return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm index b4aa0d1ed6..f1fabed013 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm @@ -35,7 +35,7 @@ /mob/living/simple_mob/mechanical/mecha/hoverpod/manned pilot_type = /mob/living/simple_mob/humanoid/merc/ranged -/mob/living/simple_mob/mechanical/mecha/hoverpod/Initialize() +/mob/living/simple_mob/mechanical/mecha/hoverpod/Initialize(mapload) ion_trail = new /datum/effect/effect/system/ion_trail_follow() ion_trail.set_up(src) ion_trail.start() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm index 961f836655..01961501f6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm @@ -42,7 +42,7 @@ var/has_repair_droid = FALSE // If true, heals 2 damage every tick and gets a repair droid overlay. -/mob/living/simple_mob/mechanical/mecha/Initialize() +/mob/living/simple_mob/mechanical/mecha/Initialize(mapload) sparks = new (src) sparks.set_up(3, 1, src) sparks.attach(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 6908176f59..301f24765f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -100,7 +100,7 @@ var/list/_slime_default_emotes = list( emote_see = list("bounces", "jiggles", "sways") emote_hear = list("squishes") -/mob/living/simple_mob/slime/Initialize() +/mob/living/simple_mob/slime/Initialize(mapload) add_verb(src, /mob/living/proc/ventcrawl) update_mood() glow_color = color diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index 253e9e37e3..bb6fac4e0d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -400,7 +400,7 @@ /mob/living/simple_mob/slime/xenobio/ruby ) -/mob/living/simple_mob/slime/xenobio/ruby/Initialize() +/mob/living/simple_mob/slime/xenobio/ruby/Initialize(mapload) add_modifier(/datum/modifier/slime_strength, null, src) // Slime is always swole. return ..() @@ -772,7 +772,7 @@ /mob/living/simple_mob/slime/xenobio/rainbow ) -/mob/living/simple_mob/slime/xenobio/rainbow/Initialize() +/mob/living/simple_mob/slime/xenobio/rainbow/Initialize(mapload) unify() return ..() @@ -785,7 +785,7 @@ // Instead lets just give them an ai_holder that does that for us. ai_holder_type = /datum/ai_holder/simple_mob/xenobio_slime/passive -/mob/living/simple_mob/slime/xenobio/rainbow/kendrick/Initialize() +/mob/living/simple_mob/slime/xenobio/rainbow/kendrick/Initialize(mapload) pacify() // So the physical mob also gets made harmless. return ..() @@ -797,7 +797,7 @@ rainbow_core_candidate = FALSE ai_holder_type = /datum/ai_holder/simple_mob/xenobio_slime/passive -/mob/living/simple_mob/slime/xenobio/pink/sana/Initialize() +/mob/living/simple_mob/slime/xenobio/pink/sana/Initialize(mapload) pacify() // So the physical mob also gets made harmless. return ..() //ChompAdd End diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index fd89f50376..a683522131 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -251,7 +251,7 @@ I think I covered everything. //add_verb(src, /mob/living/simple_mob/vore/bigdragon/proc/set_desc) //Implemented upstream faction = FACTION_NEUTRAL -/mob/living/simple_mob/vore/bigdragon/Initialize() +/mob/living/simple_mob/vore/bigdragon/Initialize(mapload) . = ..() src.adjust_nutrition(src.max_nutrition) build_icons(1) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm index 5d384b4e52..a89f2bc2f7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm @@ -249,8 +249,8 @@ I think I covered everything. //verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_desc //Implemented upstream faction = FACTION_NEUTRAL -/mob/living/simple_mob/vore/bigdragon/Initialize() - ..() +/mob/living/simple_mob/vore/bigdragon/Initialize(mapload) + . = ..() src.adjust_nutrition(src.max_nutrition) build_icons(1) voremob_loaded = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm index 7a36840810..de7e0faaa2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm @@ -35,7 +35,7 @@ prey_body = prey pred_body = pred -/mob/living/dominated_brain/Initialize() +/mob/living/dominated_brain/Initialize(mapload) if(!isliving(loc)) qdel(src) return diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm index 7fcad177f8..216c60c857 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm @@ -135,7 +135,7 @@ var/image/bigshadow var/autodoom = TRUE -/mob/living/simple_mob/vore/fennec/huge/Initialize() +/mob/living/simple_mob/vore/fennec/huge/Initialize(mapload) . = ..() bigshadow = image(icon, icon_state = "shadow") bigshadow.plane = MOB_PLANE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm index 46cdc34e74..9010e92a31 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm @@ -276,8 +276,8 @@ goia_overlays["zorgoia_belly"] = new_color update_icon() -/mob/living/simple_mob/vore/zorgoia/Initialize() - ..() +/mob/living/simple_mob/vore/zorgoia/Initialize(mapload) + . = ..() add_verb(src,/mob/living/simple_mob/vore/zorgoia/proc/appearance_switch) add_verb(src,/mob/living/simple_mob/vore/zorgoia/proc/recolor) add_verb(src,/mob/living/proc/injection) //Poison sting c: diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm index a98d2a4ba3..7b8c94e7ce 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm @@ -77,7 +77,7 @@ add_verb(src, /mob/living/proc/toggle_rider_reins) movement_cooldown = -1 -/mob/living/simple_mob/vore/leopardmander/Initialize() +/mob/living/simple_mob/vore/leopardmander/Initialize(mapload) . = ..() src.adjust_nutrition(src.max_nutrition) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm index d346978619..3300df438e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm @@ -79,8 +79,8 @@ plane_holder.set_vis(VIS_CH_STATUS_R, 1) plane_holder.set_vis(VIS_CH_BACKUP, 1) //Makes sense for player Leppy's to be able to see health. -/mob/living/simple_mob/vore/leopardmander/Initialize() - ..() +/mob/living/simple_mob/vore/leopardmander/Initialize(mapload) + . = ..() src.adjust_nutrition(src.max_nutrition) /mob/living/simple_mob/vore/leopardmander/init_vore() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm b/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm index 2c402df5f1..77963a9b9c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm @@ -63,7 +63,7 @@ pass_flags = PASSTABLE | PASSGRILLE -/mob/living/simple_mob/vore/aggressive/macrophage/Initialize() +/mob/living/simple_mob/vore/aggressive/macrophage/Initialize(mapload) . = ..() var/datum/disease/advance/random/macrophage/D = new health += D.totalResistance() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index 3f22f4e0d5..95c8d47726 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -61,7 +61,7 @@ /mob/living/simple_mob/vore/morph, /obj/effect)) -/mob/living/simple_mob/vore/morph/Initialize() +/mob/living/simple_mob/vore/morph/Initialize(mapload) add_verb(src, /mob/living/proc/ventcrawl) add_verb(src, /mob/living/simple_mob/vore/morph/proc/take_over_prey) if(!istype(src, /mob/living/simple_mob/vore/morph/dominated_prey)) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index 1920b68737..0178196718 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -259,7 +259,7 @@ name = "pet rat" ai_holder_type = /datum/ai_holder/simple_mob/retaliate -/mob/living/simple_mob/vore/aggressive/rat/pet/Initialize() +/mob/living/simple_mob/vore/aggressive/rat/pet/Initialize(mapload) .=..() var/chance = rand(1,101) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm index 5cf2045f0d..81c77e9948 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/rakshasa_abilities.dm @@ -1,4 +1,4 @@ -/mob/living/simple_mob/shadekin/Initialize() +/mob/living/simple_mob/shadekin/Initialize(mapload) var/list/ability_types = subtypesof(/obj/effect/shadekin_ability) if(name == "Rakshasa") ability_types += subtypesof(/obj/effect/rakshasa_ability) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 724ee1a343..22d2d6e02d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -83,7 +83,7 @@ var/respite_activating = FALSE //CHOMPEdit - Dark Respite var/list/active_dark_maws = list() -/mob/living/simple_mob/shadekin/Initialize() +/mob/living/simple_mob/shadekin/Initialize(mapload) //You spawned the prototype, and want a totally random one. if(type == /mob/living/simple_mob/shadekin) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm index 290898a120..c862a61c48 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm @@ -273,7 +273,7 @@ var/killswitch = FALSE -/mob/living/simple_mob/vore/woof/hostile/aweful/Initialize() +/mob/living/simple_mob/vore/woof/hostile/aweful/Initialize(mapload) . = ..() var/thismany = (rand(25,500)) / 100 resize(thismany, animate = FALSE, uncapped = TRUE, ignore_prefs = TRUE) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm index 5d4b90c5b3..e1d61f6943 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm @@ -30,7 +30,7 @@ faction = FACTION_VAMPIRE -/mob/living/simple_mob/vore/vampire/Initialize() +/mob/living/simple_mob/vore/vampire/Initialize(mapload) . = ..() if(random_skin) icon_living = pick(skins) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm index 775693ac9a..cbfe0eb491 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm @@ -329,7 +329,7 @@ B.selective_preference = DM_DIGEST B.escape_stun = 3 -/mob/living/simple_mob/vore/vore_hostile/gelatinous_cube/Initialize() +/mob/living/simple_mob/vore/vore_hostile/gelatinous_cube/Initialize(mapload) . = ..() color = random_color(TRUE) diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm index cd9de073ae..cbe2ca2051 100644 --- a/code/modules/mob/living/voice/voice.dm +++ b/code/modules/mob/living/voice/voice.dm @@ -8,7 +8,7 @@ emote_type = 2 //This lets them emote through containers. The communicator has a image feed of the person calling them so... -/mob/living/voice/Initialize(loc) +/mob/living/voice/Initialize(mapload) add_language(LANGUAGE_GALCOM) apply_default_language(GLOB.all_languages[LANGUAGE_GALCOM]) diff --git a/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm b/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm index 9a2979d3f9..8c527c111a 100644 --- a/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm +++ b/code/modules/mob/living/zz_ballistics_ch/bullet_act_ch.dm @@ -278,7 +278,7 @@ "organ_multiplier" = list(BP_HEAD = 2, BP_TORSO = 1.75, BP_GROIN = 1.25)/*Only used for simple mobs*/, \ "flesh_factors" = list("damage_mult" = 1,"velloss_mult" = 1)) -/mob/living/Initialize() +/mob/living/Initialize(mapload) . = ..() if(islist(ballistic_variables)) ballistic_variables = widelist(ballistic_variables) diff --git a/code/modules/mob/mob_planes.dm b/code/modules/mob/mob_planes.dm index e1209175e6..99a9df9ad9 100644 --- a/code/modules/mob/mob_planes.dm +++ b/code/modules/mob/mob_planes.dm @@ -206,7 +206,7 @@ * This is then used to alpha mask the lighting plane. */ -/obj/screen/plane_master/lighting/Initialize() +/obj/screen/plane_master/lighting/Initialize(mapload) . = ..() add_filter("emissives", 1, alpha_mask_filter(render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE)) add_filter("object_lighting", 2, alpha_mask_filter(render_source = O_LIGHTING_VISUAL_RENDER_TARGET, flags = MASK_INVERSE)) @@ -223,7 +223,7 @@ render_target = EMISSIVE_RENDER_TARGET alpha = 255 -/obj/screen/plane_master/emissive/Initialize() +/obj/screen/plane_master/emissive/Initialize(mapload) . = ..() add_filter("em_block_masking", 1, color_matrix_filter(GLOB.em_mask_matrix)) @@ -234,7 +234,7 @@ blend_mode = BLEND_MULTIPLY alpha = 255 -/obj/screen/plane_master/openspace/Initialize() +/obj/screen/plane_master/openspace/Initialize(mapload) . = ..() //add_filter("multiz_lighting_mask", 1, alpha_mask_filter(render_source = O_LIGHTING_VISUAL_RENDER_TARGET, flags = MASK_INVERSE)) // Makes fake planet lights not work right add_filter("first_stage_openspace", 2, drop_shadow_filter(color = "#04080FAA", size = -10)) diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index a89d7cc6ce..33766df539 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -9,7 +9,7 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image icon = 'icons/misc/loading.dmi' icon_state = "loading(old)" // CHOMPEdit -/obj/effect/lobby_image/Initialize() +/obj/effect/lobby_image/Initialize(mapload) icon = using_map.lobby_icon var/known_icon_states = cached_icon_states(icon) for(var/lobby_screen in using_map.lobby_screens) diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index e7ad3f2ee4..73985a24f4 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -108,7 +108,7 @@ assign_uid() default_apply_parts() -/obj/machinery/ntnet_relay/Initialize() +/obj/machinery/ntnet_relay/Initialize(mapload) . = ..() if(ntnet_global) ntnet_global.relays.Add(src) diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm index cf8d595a9a..3d04d7d069 100644 --- a/code/modules/modular_computers/computers/modular_computer/core.dm +++ b/code/modules/modular_computers/computers/modular_computer/core.dm @@ -41,7 +41,7 @@ /obj/item/modular_computer/proc/install_default_programs() return 1 -/obj/item/modular_computer/Initialize() +/obj/item/modular_computer/Initialize(mapload) if(!overlay_icon) overlay_icon = icon START_PROCESSING(SSobj, src) diff --git a/code/modules/modular_computers/file_system/data.dm b/code/modules/modular_computers/file_system/data.dm index c58ad7ac2b..9736ef979c 100644 --- a/code/modules/modular_computers/file_system/data.dm +++ b/code/modules/modular_computers/file_system/data.dm @@ -43,7 +43,7 @@ // /// The contents of this file. Uses paper formatting. // var/file_info = "Hello World!" -///obj/effect/computer_file_creator/Initialize() +///obj/effect/computer_file_creator/Initialize(mapload) // . = ..() // return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm index af6f1de418..0b4b5e4e21 100644 --- a/code/modules/multiz/basic.dm +++ b/code/modules/multiz/basic.dm @@ -8,7 +8,7 @@ var/list/z_levels = list()// Each bit re... haha just kidding this is a list of z_levels.len = i z_levels[i] = TRUE -/obj/effect/landmark/map_data/Initialize() +/obj/effect/landmark/map_data/Initialize(mapload) ..() return INITIALIZE_HINT_QDEL @@ -52,4 +52,4 @@ var/list/z_levels = list()// Each bit re... haha just kidding this is a list of else if (dir == DOWN) . = GetBelow(ref) else - . = get_step(ref, dir) \ No newline at end of file + . = get_step(ref, dir) diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm index fd6066bc33..9c78812575 100644 --- a/code/modules/multiz/ladders.dm +++ b/code/modules/multiz/ladders.dm @@ -13,7 +13,7 @@ var/climb_time = 2 SECONDS -/obj/structure/ladder/Initialize() +/obj/structure/ladder/Initialize(mapload) . = ..() // the upper will connect to the lower if(allowed_directions & DOWN) //we only want to do the top one, as it will initialize the ones before it. diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm index 6c13828d4a..5a057d3983 100644 --- a/code/modules/multiz/stairs.dm +++ b/code/modules/multiz/stairs.dm @@ -9,7 +9,7 @@ unacidable = TRUE layer = STAIRS_LAYER -/obj/structure/stairs/Initialize() +/obj/structure/stairs/Initialize(mapload) . = ..() if(check_integrity()) update_icon() @@ -71,7 +71,7 @@ var/obj/structure/stairs/top/top = null var/obj/structure/stairs/middle/middle = null -/obj/structure/stairs/bottom/Initialize() +/obj/structure/stairs/bottom/Initialize(mapload) . = ..() if(!GetAbove(src)) warning("Stair created without level above: ([loc.x], [loc.y], [loc.z])") @@ -245,7 +245,7 @@ var/obj/structure/stairs/top/top = null var/obj/structure/stairs/bottom/bottom = null -/obj/structure/stairs/middle/Initialize() +/obj/structure/stairs/middle/Initialize(mapload) . = ..() if(!GetAbove(src)) warning("Stair created without level above: ([loc.x], [loc.y], [loc.z])") @@ -328,7 +328,7 @@ var/obj/structure/stairs/middle/middle = null var/obj/structure/stairs/bottom/bottom = null -/obj/structure/stairs/top/Initialize() +/obj/structure/stairs/top/Initialize(mapload) . = ..() if(!GetBelow(src)) warning("Stair created without level below: ([loc.x], [loc.y], [loc.z])") @@ -497,7 +497,7 @@ icon = 'icons/obj/structures/stairs_64x64.dmi' icon_state = "" -/obj/structure/stairs/spawner/Initialize() +/obj/structure/stairs/spawner/Initialize(mapload) ..() var/turf/B1 = get_step(get_turf(src), turn(dir, 180)) var/turf/B2 = get_turf(src) diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index 22d149be09..8a11dcfcad 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -65,7 +65,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr nitrogen = 0 temperature = TCMB -/turf/simulated/open/Initialize() +/turf/simulated/open/Initialize(mapload) . = ..() ASSERT(HasBelow(z)) add_overlay(GLOB.openspace_backdrop_one_for_all, TRUE) //Special grey square for projecting backdrop darkness filter on it. @@ -176,7 +176,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr // /turf/simulated/floor/glass/setup_broken_states() // return list("glass-damaged1", "glass-damaged2", "glass-damaged3") -/turf/simulated/floor/glass/Initialize() +/turf/simulated/floor/glass/Initialize(mapload) icon_state = "" //Prevent the normal icon from appearing behind the smooth overlays ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/nifsoft/nif_softshop.dm b/code/modules/nifsoft/nif_softshop.dm index a687710621..f596bf1fb4 100644 --- a/code/modules/nifsoft/nif_softshop.dm +++ b/code/modules/nifsoft/nif_softshop.dm @@ -17,7 +17,7 @@ opacity = 0 var/datum/entopic/entopic -/obj/machinery/vending/nifsoft_shop/Initialize() +/obj/machinery/vending/nifsoft_shop/Initialize(mapload) . = ..() if(wires) diff --git a/code/modules/organs/internal/augment.dm b/code/modules/organs/internal/augment.dm index dae96cf498..e64506bd30 100644 --- a/code/modules/organs/internal/augment.dm +++ b/code/modules/organs/internal/augment.dm @@ -32,7 +32,7 @@ description_fluff = "If attempting to implant a compatible augment into a synthetic limb, the limb must be screwdrivered open and then modified with a multitool before insertion can begin." -/obj/item/organ/internal/augment/Initialize() +/obj/item/organ/internal/augment/Initialize(mapload) . = ..() setup_radial_icon() if(integrated_object_type) diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index 1e745fe7f9..fcd6f5b1c1 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -192,7 +192,7 @@ /datum/matter_synth/wire ) -/obj/item/organ/internal/augment/armmounted/shoulder/multiple/Initialize() +/obj/item/organ/internal/augment/armmounted/shoulder/multiple/Initialize(mapload) . = ..() if(integrated_object) diff --git a/code/modules/organs/internal/spleen.dm b/code/modules/organs/internal/spleen.dm index 86299edfc8..f0f0e31ddc 100644 --- a/code/modules/organs/internal/spleen.dm +++ b/code/modules/organs/internal/spleen.dm @@ -72,6 +72,6 @@ spleen_efficiency = 0.3 spleen_tick = 15 -/obj/item/organ/internal/spleen/minor/Initialize() +/obj/item/organ/internal/spleen/minor/Initialize(mapload) . = ..() adjust_scale(0.7) diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm index d800eb44d0..83351734b8 100644 --- a/code/modules/organs/internal/stomach.dm +++ b/code/modules/organs/internal/stomach.dm @@ -11,7 +11,7 @@ var/deadly_hold = TRUE // Does the stomach do damage to mobs eaten by its owner? Xenos should probably have this FALSE. -/obj/item/organ/internal/stomach/Initialize() +/obj/item/organ/internal/stomach/Initialize(mapload) . = ..() if(reagents) reagents.maximum_volume = 30 diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm index 405c5a0e82..6d75804172 100644 --- a/code/modules/organs/robolimbs.dm +++ b/code/modules/organs/robolimbs.dm @@ -577,7 +577,7 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\ icon_state = "datadisk2" var/species = SPECIES_HUMAN -/obj/item/disk/species/Initialize() +/obj/item/disk/species/Initialize(mapload) . = ..() if(species) name = "[species] [initial(name)]" diff --git a/code/modules/organs/subtypes/diona.dm b/code/modules/organs/subtypes/diona.dm index 7534e1e4a2..415875c66e 100644 --- a/code/modules/organs/subtypes/diona.dm +++ b/code/modules/organs/subtypes/diona.dm @@ -211,7 +211,7 @@ parent_organ = BP_TORSO vital = TRUE -/obj/item/organ/internal/brain/cephalon/Initialize() +/obj/item/organ/internal/brain/cephalon/Initialize(mapload) . = ..() spawn(30 SECONDS) // FBP Dionaea need some way to be disassembled through surgery, if absolutely necessary. if(!owner.isSynthetic()) diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm index 023ccc8005..0c415055f6 100644 --- a/code/modules/organs/subtypes/nano.dm +++ b/code/modules/organs/subtypes/nano.dm @@ -195,7 +195,7 @@ icon = 'icons/mob/species/protean/protean.dmi' icon_state = "posi" -/obj/item/mmi/digital/posibrain/nano/Initialize() +/obj/item/mmi/digital/posibrain/nano/Initialize(mapload) . = ..() icon_state = "posi" diff --git a/code/modules/organs/subtypes/skrell.dm b/code/modules/organs/subtypes/skrell.dm index 5f2d494105..8b7bc3b16c 100644 --- a/code/modules/organs/subtypes/skrell.dm +++ b/code/modules/organs/subtypes/skrell.dm @@ -36,6 +36,6 @@ parent_organ = BP_HEAD spleen_efficiency = 0.5 -/obj/item/organ/internal/spleen/skrell/Initialize() +/obj/item/organ/internal/spleen/skrell/Initialize(mapload) . = ..() - adjust_scale(0.8,0.7) \ No newline at end of file + adjust_scale(0.8,0.7) diff --git a/code/modules/organs/subtypes/slime.dm b/code/modules/organs/subtypes/slime.dm index a8a96b7672..2e934a2a03 100644 --- a/code/modules/organs/subtypes/slime.dm +++ b/code/modules/organs/subtypes/slime.dm @@ -91,7 +91,7 @@ var/last_strain_increase = 0 // World time of the last increase in strain. var/strain_regen_cooldown = 5 MINUTES -/obj/item/organ/internal/regennetwork/Initialize() +/obj/item/organ/internal/regennetwork/Initialize(mapload) . = ..() var/mob/living/carbon/human/H = null spawn(15) diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 1eafeff808..84abf4e58d 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -277,7 +277,7 @@ throwforce = 7 var/eyes_over_markings = FALSE //VOREStation edit -/obj/item/organ/external/head/Initialize() +/obj/item/organ/external/head/Initialize(mapload) if(CONFIG_GET(flag/allow_headgibs)) cannot_gib = FALSE return ..() diff --git a/code/modules/overmap/disperser/disperser.dm b/code/modules/overmap/disperser/disperser.dm index 23e2bae204..1df8690613 100644 --- a/code/modules/overmap/disperser/disperser.dm +++ b/code/modules/overmap/disperser/disperser.dm @@ -9,7 +9,7 @@ density = TRUE anchored = TRUE -/obj/machinery/disperser/Initialize() +/obj/machinery/disperser/Initialize(mapload) . = ..() // TODO - Remove this bit once machines are converted to Initialize if(ispath(circuit)) diff --git a/code/modules/overmap/disperser/disperser_console.dm b/code/modules/overmap/disperser/disperser_console.dm index f579135237..1feea6d5fa 100644 --- a/code/modules/overmap/disperser/disperser_console.dm +++ b/code/modules/overmap/disperser/disperser_console.dm @@ -25,7 +25,7 @@ var/next_shot = 0 //round time where the next shot can start from var/const/coolinterval = 2 MINUTES //time to wait between safe shots in deciseconds -/obj/machinery/computer/ship/disperser/Initialize() +/obj/machinery/computer/ship/disperser/Initialize(mapload) . = ..() link_parts() reset_calibration() diff --git a/code/modules/overmap/events/overmap_event.dm b/code/modules/overmap/events/overmap_event.dm index e64f71170b..d4cb72dbec 100644 --- a/code/modules/overmap/events/overmap_event.dm +++ b/code/modules/overmap/events/overmap_event.dm @@ -14,7 +14,7 @@ var/difficulty = EVENT_LEVEL_MODERATE var/weaknesses //if the BSA can destroy them and with what -/obj/effect/overmap/event/Initialize() +/obj/effect/overmap/event/Initialize(mapload) . = ..() icon_state = pick(event_icon_states) GLOB.overmap_event_handler.update_hazards(loc) diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm index c6f43c4702..610d9d55ed 100644 --- a/code/modules/overmap/overmap_object.dm +++ b/code/modules/overmap/overmap_object.dm @@ -35,7 +35,7 @@ var/list/cam_plane_masters var/obj/screen/background/cam_background -/obj/effect/overmap/Initialize() +/obj/effect/overmap/Initialize(mapload) . = ..() if(!global.using_map.use_overmap) return INITIALIZE_HINT_QDEL diff --git a/code/modules/overmap/overmap_planet.dm b/code/modules/overmap/overmap_planet.dm index 73dd092638..726e7df309 100644 --- a/code/modules/overmap/overmap_planet.dm +++ b/code/modules/overmap/overmap_planet.dm @@ -19,7 +19,7 @@ var/skybox_offset_x = 0 var/skybox_offset_y = 0 -/obj/effect/overmap/visitable/planet/Initialize() +/obj/effect/overmap/visitable/planet/Initialize(mapload) . = ..() /obj/effect/overmap/visitable/planet/get_skybox_representation() diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm index ac9c571184..e05930021a 100644 --- a/code/modules/overmap/overmap_shuttle.dm +++ b/code/modules/overmap/overmap_shuttle.dm @@ -125,7 +125,7 @@ var/parent_shuttle var/base_tank = /obj/item/tank/phoron -/obj/structure/fuel_port/Initialize() +/obj/structure/fuel_port/Initialize(mapload) . = ..() if(base_tank) new base_tank(src) diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index e27cc3adb3..cc99f90b87 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -49,7 +49,7 @@ var/unique_identifier //Define this for objs that we want to be able to rename. Needed to avoid compiler errors if not included. -/obj/effect/overmap/visitable/Initialize() +/obj/effect/overmap/visitable/Initialize(mapload) . = ..() if(. == INITIALIZE_HINT_QDEL) return diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 8760d93e24..0b746583dd 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) icon_screen = "adv_helm_screen" light_color = "#70ffa0" -/obj/machinery/computer/ship/helm/Initialize() +/obj/machinery/computer/ship/helm/Initialize(mapload) . = ..() get_known_sectors() @@ -286,7 +286,7 @@ GLOBAL_LIST_EMPTY(all_waypoints) circuit = /obj/item/circuitboard/nav var/datum/tgui_module/ship/nav/nav_tgui -/obj/machinery/computer/ship/navigation/Initialize() +/obj/machinery/computer/ship/navigation/Initialize(mapload) . = ..() nav_tgui = new(src) diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index b03368892a..8772694e39 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -81,7 +81,7 @@ /obj/machinery/atmospherics/unary/engine/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) return 0 -/obj/machinery/atmospherics/unary/engine/Initialize() +/obj/machinery/atmospherics/unary/engine/Initialize(mapload) . = ..() controller = new(src) update_nearby_tiles(need_rebuild=1) diff --git a/code/modules/overmap/ships/engines/ion_thruster.dm b/code/modules/overmap/ships/engines/ion_thruster.dm index 54f05f8d7f..d569e183a0 100644 --- a/code/modules/overmap/ships/engines/ion_thruster.dm +++ b/code/modules/overmap/ships/engines/ion_thruster.dm @@ -49,7 +49,7 @@ var/burn_cost = 7500 var/generated_thrust = 2.5 -/obj/machinery/ion_engine/Initialize() +/obj/machinery/ion_engine/Initialize(mapload) . = ..() controller = new(src) add_glow() @@ -87,4 +87,4 @@ req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/matter_bin = 1, - /obj/item/stock_parts/capacitor = 2) \ No newline at end of file + /obj/item/stock_parts/capacitor = 2) diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm index cbacd0cb3e..ba3eabbfb1 100644 --- a/code/modules/overmap/ships/ship.dm +++ b/code/modules/overmap/ships/ship.dm @@ -47,7 +47,7 @@ var/obj/effect/overlay/vis/vector render_map = TRUE -/obj/effect/overmap/visitable/ship/Initialize() +/obj/effect/overmap/visitable/ship/Initialize(mapload) . = ..() min_speed = round(min_speed, SHIP_MOVE_RESOLUTION) max_speed = round(max_speed, SHIP_MOVE_RESOLUTION) diff --git a/code/modules/overmap/ships/ship_vr.dm b/code/modules/overmap/ships/ship_vr.dm index cbab234f9d..34ee8d20a4 100644 --- a/code/modules/overmap/ships/ship_vr.dm +++ b/code/modules/overmap/ships/ship_vr.dm @@ -1,4 +1,4 @@ -/obj/effect/overmap/visitable/ship/Initialize() +/obj/effect/overmap/visitable/ship/Initialize(mapload) . = ..() listening_objects += src diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index 20e63f7e76..9d572cb702 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -5,7 +5,7 @@ known = FALSE in_space = TRUE -/obj/effect/overmap/visitable/sector/temporary/Initialize() +/obj/effect/overmap/visitable/sector/temporary/Initialize(mapload) if(!istype(loc, /turf/unsimulated/map)) CRASH("Attempt to create deepspace which is not on overmap: [log_info_line(loc)]") // Tell sector initializer where are is where we want to be. diff --git a/code/modules/overmap/turfs.dm b/code/modules/overmap/turfs.dm index 6b264f3d0e..6c5cbebbf2 100644 --- a/code/modules/overmap/turfs.dm +++ b/code/modules/overmap/turfs.dm @@ -20,7 +20,7 @@ var/global/list/map_sectors = list() var/map_is_to_my var/turf/unsimulated/map/edge/wrap_buddy -/turf/unsimulated/map/edge/Initialize() +/turf/unsimulated/map/edge/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD @@ -51,7 +51,7 @@ var/global/list/map_sectors = list() else . = ..() -/turf/unsimulated/map/Initialize() +/turf/unsimulated/map/Initialize(mapload) . = ..() name = "[x]-[y]" var/list/numbers = list() diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index 969dfe786d..ed68f9bd58 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -16,8 +16,8 @@ var/footer = null var/footerOn = FALSE -/obj/item/paper/admin/Initialize() //ChompEDIT New --> Initialize - ..() +/obj/item/paper/admin/Initialize(mapload) //ChompEDIT New --> Initialize + . = ..() generateInteractions() diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 8ef985f147..4e75ee0c92 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -25,7 +25,7 @@ icon_state = "tallcabinet" -/obj/structure/filingcabinet/Initialize() +/obj/structure/filingcabinet/Initialize(mapload) for(var/obj/item/I in loc) if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo) || istype(I, /obj/item/paper_bundle)) I.loc = src diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index 623fcc127e..42e11fc2da 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -84,7 +84,7 @@ return -/obj/item/sticky_pad/random/Initialize() +/obj/item/sticky_pad/random/Initialize(mapload) . = ..() color = pick(COLOR_YELLOW, COLOR_LIME, COLOR_CYAN, COLOR_ORANGE, COLOR_PINK) @@ -95,7 +95,7 @@ color = COLOR_YELLOW slot_flags = 0 -/obj/item/paper/sticky/Initialize() +/obj/item/paper/sticky/Initialize(mapload) . = ..() AddComponent(/datum/component/recursive_move) RegisterSignal(src, COMSIG_OBSERVER_MOVED, /obj/item/paper/sticky/proc/reset_persistence_tracking) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index 72e5931f9f..dea46fe7ad 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -11,7 +11,7 @@ var/obj/item/paper/internalPaper -/obj/item/paperplane/Initialize(loc, obj/item/paper/newPaper) //ChompEDIT New --> Initialize +/obj/item/paperplane/Initialize(mapload, obj/item/paper/newPaper) //ChompEDIT New --> Initialize . = ..() pixel_y = rand(-8, 8) pixel_x = rand(-9, 9) diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 1cb945e01b..429cf692fc 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -25,7 +25,7 @@ /obj/item/paper_bundle = 3, ) -/obj/machinery/papershredder/Initialize() +/obj/machinery/papershredder/Initialize(mapload) . = ..() default_apply_parts() update_icon() diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 75ed4896ed..a1e4003e00 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -175,7 +175,7 @@ var/active_icon_state var/default_icon_state -/obj/item/pen/blade/Initialize() +/obj/item/pen/blade/Initialize(mapload) . = ..() active_icon_state = "[icon_state]-x" default_icon_state = icon_state diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index bbcb1586fa..69a789c006 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -18,7 +18,7 @@ var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! var/copying = FALSE // Is the printer busy with something? Sanity check variable. -/obj/machinery/photocopier/Initialize() +/obj/machinery/photocopier/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index 2599544eb3..5d3e7dc004 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -150,7 +150,7 @@ var/list/civilian_cartridges = list( desc = "A data cartridge with an integrated radio signaler module." programs = list(new/datum/data/pda/app/signaller) -/obj/item/cartridge/signal/Initialize() +/obj/item/cartridge/signal/Initialize(mapload) radio = new /obj/item/radio/integrated/signal(src) . = ..() @@ -236,7 +236,7 @@ var/list/civilian_cartridges = list( new/datum/data/pda/app/status_display) -/obj/item/cartridge/rd/Initialize() +/obj/item/cartridge/rd/Initialize(mapload) radio = new /obj/item/radio/integrated/signal(src) . = ..() diff --git a/code/modules/pda/cart_vr.dm b/code/modules/pda/cart_vr.dm index 0ef256ef9b..b669cf03e5 100644 --- a/code/modules/pda/cart_vr.dm +++ b/code/modules/pda/cart_vr.dm @@ -31,7 +31,7 @@ var/list/exploration_cartridges = list( var/slots = 1 var/obj/item/storage/internal/hold -/obj/item/cartridge/storage/Initialize() +/obj/item/cartridge/storage/Initialize(mapload) . = ..() hold = new/obj/item/storage/internal(src) hold.max_storage_space = slots * 2 diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm index 1c3705db97..866ed2e0ce 100644 --- a/code/modules/pda/pda.dm +++ b/code/modules/pda/pda.dm @@ -183,7 +183,7 @@ var/global/list/obj/item/pda/PDAs = list() start_program(find_program(/datum/data/pda/app/main_menu)) //ChompEDIT START - move icon ops to initialize -/obj/item/pda/Initialize() +/obj/item/pda/Initialize(mapload) . = ..() add_overlay("pda-pen") //ChompEDIT END diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm index b3d00a7a8c..ee406ddf45 100644 --- a/code/modules/pda/radio.dm +++ b/code/modules/pda/radio.dm @@ -17,7 +17,7 @@ on = 0 //Are we currently active?? var/menu_message = "" -/obj/item/radio/integrated/Initialize() +/obj/item/radio/integrated/Initialize(mapload) ..() if(istype(loc.loc, /obj/item/pda)) hostpda = loc.loc @@ -106,7 +106,7 @@ radio_connection = null return ..() -/obj/item/radio/integrated/signal/Initialize() +/obj/item/radio/integrated/signal/Initialize(mapload) . = ..() if(radio_controller) if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ) diff --git a/code/modules/persistence/filth.dm b/code/modules/persistence/filth.dm index 55590c805c..2bff852a11 100644 --- a/code/modules/persistence/filth.dm +++ b/code/modules/persistence/filth.dm @@ -8,6 +8,6 @@ anchored = TRUE persistent = TRUE -/obj/effect/decal/cleanable/filth/Initialize() +/obj/effect/decal/cleanable/filth/Initialize(mapload) . = ..() alpha = rand(180,220) diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm index 371df0d379..725b7f05a4 100644 --- a/code/modules/persistence/noticeboard.dm +++ b/code/modules/persistence/noticeboard.dm @@ -10,7 +10,7 @@ var/base_icon_state = "nboard0" var/const/max_notices = 5 -/obj/structure/noticeboard/Initialize() +/obj/structure/noticeboard/Initialize(mapload) . = ..() // Grab any mapped notices. @@ -179,7 +179,7 @@ notices = 5 icon_state = "nboard05" -/obj/structure/noticeboard/anomaly/Initialize() //ChompEDIT New --> Initialize +/obj/structure/noticeboard/anomaly/Initialize(mapload) //ChompEDIT New --> Initialize var/obj/item/paper/P = new() P.name = "Memo RE: proper analysis procedure" P.info = "
We keep test dummies in pens here for a reason, so standard procedure should be to activate newfound alien artifacts and place the two in close proximity. Promising items I might even approve monkey testing on." diff --git a/code/modules/persistence/noticeboard_yw.dm b/code/modules/persistence/noticeboard_yw.dm index 09c50d3bd8..7b623bc817 100644 --- a/code/modules/persistence/noticeboard_yw.dm +++ b/code/modules/persistence/noticeboard_yw.dm @@ -6,7 +6,7 @@ name = "medical notice board" icon_state = "nboard02" -/obj/structure/noticeboard/medical/Initialize() +/obj/structure/noticeboard/medical/Initialize(mapload) var/obj/item/paper/P = new() P.name = "Staff Notice: Patient rooms" P.info = "
No matter how many times I've said this, it doesn't seem to stick, so I'm leaving this reminder: Screwing patients in the patient rooms is a serious breach of professionality and your code of ethics. Take it to the dorms." @@ -26,7 +26,7 @@ name = "toxins lab notice board" icon_state = "nboard01" -/obj/structure/noticeboard/toxins/Initialize() +/obj/structure/noticeboard/toxins/Initialize(mapload) var/obj/item/paper/P = new() P.name = "Staff Notice: Toxins Mixing" P.info = "
Toxins Mixing is currently shut down for the time being, due to damage requiring parts from off station to fix. Please do not use at this time, or risk setting the entire outpost on fire." @@ -39,7 +39,7 @@ name = "nanite lab notice board" icon_state = "nboard01" -/obj/structure/noticeboard/nanite/Initialize() +/obj/structure/noticeboard/nanite/Initialize(mapload) var/obj/item/paper/P = new() P.name = "Staff Notice: Nanite Laboratory" P.info = "
The Nanite Laboratory is nearly complete. We're simply awaiting specialized machinery and equipment from central. The lab is currently shut down. Please do not use at this time." @@ -52,7 +52,7 @@ name = "blueshield notice board" icon_state = "nboard01" -/obj/structure/noticeboard/blueshield/Initialize() +/obj/structure/noticeboard/blueshield/Initialize(mapload) var/obj/item/paper/P = new() P.name = "Staff Notice: Blueshield Special Reserve" P.info = "
This secure storage unit is intended to be used for special equipment specifically for the use of Blueshield Agents in the event of a Code Red threat to Heads of Staff. Heads of Staff found 'commandeering' this equipment can expect to be severely reprimanded.

(Underneath, there is a messy handwritten addition.)
Sorry, we haven't had time or spare funds to issue anything yet. You know how frontier budgets are! Sit tight, champ. -Z.V." @@ -64,7 +64,7 @@ /obj/structure/noticeboard/library icon_state = "nboard02" -/obj/structure/noticeboard/library/Initialize() +/obj/structure/noticeboard/library/Initialize(mapload) var/obj/item/paper/P = new() P.name = "Library Warning: coffee stains" P.info = "
I seem to tell you guys this daily, but please, stop bringing coffee to carpeted areas. It's hard enough to get the stains off wood,let alone carpet." @@ -79,7 +79,7 @@ /obj/structure/noticeboard/exploration icon_state = "nboard03" -/obj/structure/noticeboard/exploration/Initialize() +/obj/structure/noticeboard/exploration/Initialize(mapload) var/obj/item/paper/P = new() P.name = "Memo: Prototype ship" P.info = "
With the lost of our last Research installation and the damage sustained to the old exploration shuttle,We've decided to finally approve the construction of the Prototype Star-Runner class Exploration Vessel. Keep in mind it's a prototype, so try not to scratch it's paint. We don't have a second." @@ -105,7 +105,7 @@ /obj/structure/noticeboard/airlock icon_state = "nboard01" -/obj/structure/noticeboard/airlock/Initialize() +/obj/structure/noticeboard/airlock/Initialize(mapload) var/obj/item/paper/P = new() P.name = "Staff Notice: Airlock Proceedure" P.info = "
Due to the large amount of new staff unfamiliar with our proceedures we've left you some instructions.
To exit through an airlock, simply hit the button to open the interior, and then cycle to exterior once inside. To re-enter the station, enter the airlock, Close the exterior hatch, and look for the customized thermal regulators installed on the wall.
This should heat up the air in the airlock, allowing you to open the interior door with no issues." diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index b5ac54598e..a31cf3f342 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -711,7 +711,7 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors) ) -/turf/simulated/floor/outdoors/grass/forest/virgo3c/Initialize() +/turf/simulated/floor/outdoors/grass/forest/virgo3c/Initialize(mapload) if(tree_chance && prob(tree_chance) && !check_density()) new /obj/structure/flora/tree/bigtree(src) diff --git a/code/modules/power/batteryrack_vr.dm b/code/modules/power/batteryrack_vr.dm index c9e08741c2..223a31abd5 100644 --- a/code/modules/power/batteryrack_vr.dm +++ b/code/modules/power/batteryrack_vr.dm @@ -2,7 +2,7 @@ var/cell_type = /obj/item/cell/apc var/cell_number = 3 -/obj/machinery/power/smes/batteryrack/mapped/Initialize() +/obj/machinery/power/smes/batteryrack/mapped/Initialize(mapload) . = ..() for(var/i = 1 to cell_number) if(i > max_cells) diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 76576bc7ec..70c145f371 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -29,7 +29,7 @@ for(var/datum/tgui_module/rcon/R in world) R.FindDevices() -/obj/machinery/power/breakerbox/Initialize() +/obj/machinery/power/breakerbox/Initialize(mapload) . = ..() default_apply_parts() @@ -37,7 +37,7 @@ icon_state = "bbox_on" // Enabled on server startup. Used in substations to keep them in bypass mode. -/obj/machinery/power/breakerbox/activated/Initialize() +/obj/machinery/power/breakerbox/activated/Initialize(mapload) . = ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index f4e6ee5b52..fd90c68895 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -527,7 +527,7 @@ var/list/possible_cable_coil_colours = list( uses_charge = 1 charge_costs = list(1) -/obj/item/stack/cable_coil/Initialize(ml, length = MAXCOIL, var/param_color = null) +/obj/item/stack/cable_coil/Initialize(mapload, length = MAXCOIL, var/param_color = null) . = ..() amount = length if (param_color) // It should be red by default, so only recolor it if parameter was specified. @@ -824,7 +824,7 @@ var/list/possible_cable_coil_colours = list( /obj/item/stack/cable_coil/cut item_state = "coil2" -/obj/item/stack/cable_coil/cut/Initialize(ml) +/obj/item/stack/cable_coil/cut/Initialize(mapload) . = ..() amount = rand(1,2) pixel_x = rand(-2,2) @@ -904,12 +904,12 @@ var/list/possible_cable_coil_colours = list( stacktype = /obj/item/stack/cable_coil color = COLOR_BROWN -/obj/item/stack/cable_coil/random/Initialize() +/obj/item/stack/cable_coil/random/Initialize(mapload) stacktype = /obj/item/stack/cable_coil color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN, COLOR_SILVER, COLOR_GRAY, COLOR_BLACK, COLOR_MAROON, COLOR_OLIVE, COLOR_LIME, COLOR_TEAL, COLOR_NAVY, COLOR_PURPLE, COLOR_BEIGE, COLOR_BROWN) . = ..() -/obj/item/stack/cable_coil/random_belt/Initialize() +/obj/item/stack/cable_coil/random_belt/Initialize(mapload) stacktype = /obj/item/stack/cable_coil color = pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE) amount = 30 @@ -952,7 +952,7 @@ var/list/possible_cable_coil_colours = list( stacktype = null toolspeed = 0.25 -/obj/item/stack/cable_coil/alien/Initialize(ml, length = MAXCOIL, var/param_color = null) //There has to be a better way to do this. +/obj/item/stack/cable_coil/alien/Initialize(mapload, length = MAXCOIL, var/param_color = null) //There has to be a better way to do this. . = ..() if(embed_chance == -1) //From /obj/item, don't want to do what the normal cable_coil does if(sharp) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 7a9feecfe2..2c15c1a754 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -36,7 +36,7 @@ var/standard_overlays = TRUE var/last_overlay_state = null // Used to optimize update_icon() calls. -/obj/item/cell/Initialize() +/obj/item/cell/Initialize(mapload) . = ..() c_uid = cell_uid++ update_icon() diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm index 28808efc57..36d7808c9a 100644 --- a/code/modules/power/cells/device_cells.dm +++ b/code/modules/power/cells/device_cells.dm @@ -97,7 +97,7 @@ charge_amount = 20 origin_tech = list(TECH_POWER = 3) -/obj/item/cell/device/super/empty/Initialize() +/obj/item/cell/device/super/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -110,7 +110,7 @@ charge_amount = 20 origin_tech = list(TECH_POWER = 4) -/obj/item/cell/device/hyper/empty/Initialize() +/obj/item/cell/device/hyper/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -125,7 +125,7 @@ charge_amount = 20 origin_tech = list(TECH_POWER = 5, TECH_PRECURSOR = 1) -/obj/item/cell/device/giga/empty/Initialize() +/obj/item/cell/device/giga/empty/Initialize(mapload) . = ..() charge = 0 update_icon() diff --git a/code/modules/power/cells/power_cells.dm b/code/modules/power/cells/power_cells.dm index e55ecc3424..3bf65fe33c 100644 --- a/code/modules/power/cells/power_cells.dm +++ b/code/modules/power/cells/power_cells.dm @@ -203,7 +203,7 @@ /obj/item/cell/emergency_light/update_icon() //No visible charge indicator return -/obj/item/cell/emergency_light/Initialize() +/obj/item/cell/emergency_light/Initialize(mapload) . = ..() var/area/A = get_area(src) if(!A.lightswitch || !A.light_power) @@ -223,7 +223,7 @@ var/amount = 100 var/used = FALSE -/obj/item/fbp_backup_cell/Initialize() +/obj/item/fbp_backup_cell/Initialize(mapload) . = ..() add_overlay("[icon_state]_100") diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm index b811632986..eda420b89a 100644 --- a/code/modules/power/fusion/core/_core.dm +++ b/code/modules/power/fusion/core/_core.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(fusion_cores) /obj/machinery/power/fusion_core/mapped anchored = TRUE -/obj/machinery/power/fusion_core/Initialize() +/obj/machinery/power/fusion_core/Initialize(mapload) . = ..() GLOB.fusion_cores += src @@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(fusion_cores) default_apply_parts() -/obj/machinery/power/fusion_core/mapped/Initialize() +/obj/machinery/power/fusion_core/mapped/Initialize(mapload) . = ..() connect_to_network() diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm index a5fef7ee7c..2932b1a7cf 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm @@ -17,7 +17,7 @@ fuel_colour = _colour ..(newloc) -/obj/item/fuel_assembly/Initialize() +/obj/item/fuel_assembly/Initialize(mapload) . = ..() var/datum/material/material = get_material_by_name(fuel_type) if(istype(material)) diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm index d7ed3d97cc..7c8611dcd1 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm @@ -7,7 +7,7 @@ /obj/item/fuel_assembly/blitz/New(var/newloc) ..(newloc, "blitz") -/obj/item/fuel_assembly/blitz/unshielded/Initialize() +/obj/item/fuel_assembly/blitz/unshielded/Initialize(mapload) . = ..() name = "unshielded blitz rod" desc = "An extremely unstable, raw rod of compressed supermatter and phoron. This seems like a terrible idea." @@ -65,7 +65,7 @@ /obj/item/fuel_assembly/blitz/shielded name = "blitz rod" -/obj/item/fuel_assembly/blitz/shielded/Initialize() +/obj/item/fuel_assembly/blitz/shielded/Initialize(mapload) . = ..() name = "blitz rod" desc = "A highly unstable, and highly explosive supermatter and phoron fuel rod with a lead shell, created by someone of questionable sanity. This thing has to violate at least a few intergalactic regulations." diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm index 5a18b6f54f..487f5c5b95 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -9,7 +9,7 @@ circuit = /obj/item/circuitboard/fusion_fuel_compressor -/obj/machinery/fusion_fuel_compressor/Initialize() +/obj/machinery/fusion_fuel_compressor/Initialize(mapload) . = ..() default_apply_parts() verbs -= /obj/machinery/fusion_fuel_compressor/verb/eject_sheet //CHOMPAdd diff --git a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm index 9514f59622..920ee805d6 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_injector.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_injector.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(fuel_injectors) var/injecting = 0 var/obj/item/fuel_assembly/cur_assembly -/obj/machinery/fusion_fuel_injector/Initialize() +/obj/machinery/fusion_fuel_injector/Initialize(mapload) . = ..() GLOB.fuel_injectors += src default_apply_parts() diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm index 7f35f417ed..d1db1cf5e7 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(gyrotrons) anchored = TRUE state = 2 -/obj/machinery/power/emitter/gyrotron/Initialize() +/obj/machinery/power/emitter/gyrotron/Initialize(mapload) GLOB.gyrotrons += src default_apply_parts() return ..() diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 4bb014596d..b147e2aab8 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(all_turbines) var/lastgenlev = 0 var/datum/looping_sound/generator/soundloop -/obj/machinery/power/generator/Initialize() +/obj/machinery/power/generator/Initialize(mapload) soundloop = new(list(src), FALSE) desc = initial(desc) + " Rated for [round(max_power/1000)] kW." GLOB.all_turbines += src @@ -289,4 +289,3 @@ GLOBAL_LIST_EMPTY(all_turbines) sleep(1) if(i >= limit) break - diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 3d8cdfe77f..3b31907345 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -24,11 +24,11 @@ var/effectiverange = 25 // Borrows code from cloning computer -/obj/machinery/computer/gravity_control_computer/Initialize() +/obj/machinery/computer/gravity_control_computer/Initialize(mapload) . = ..() updatemodules() -/obj/machinery/gravity_generator/Initialize() +/obj/machinery/gravity_generator/Initialize(mapload) . = ..() locatelocalareas() diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm index b051ccfb9b..d8b161b746 100644 --- a/code/modules/power/gravitygenerator_vr.dm +++ b/code/modules/power/gravitygenerator_vr.dm @@ -93,7 +93,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) use_power = USE_POWER_ACTIVE current_overlay = "activated" -/obj/machinery/gravity_generator/main/station/Initialize() +/obj/machinery/gravity_generator/main/station/Initialize(mapload) . = ..() setup_parts() middle.add_overlay("activated") @@ -127,7 +127,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) var/list/levels = list() var/list/areas = list() -/obj/machinery/gravity_generator/main/Initialize() +/obj/machinery/gravity_generator/main/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm index 6a9f05a53b..cd4d1b9679 100644 --- a/code/modules/power/grid_checker.dm +++ b/code/modules/power/grid_checker.dm @@ -15,7 +15,7 @@ var/wire_allow_manual_3 = FALSE var/opened = FALSE -/obj/machinery/power/grid_checker/Initialize() +/obj/machinery/power/grid_checker/Initialize(mapload) . = ..() connect_to_network() update_icon() diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index f0aeb7e033..009d677949 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -260,13 +260,13 @@ /obj/machinery/light/broken icon_state = "tube-broken" -/obj/machinery/light/broken/Initialize() +/obj/machinery/light/broken/Initialize(mapload) . = ..() broken() /obj/machinery/light/broken/small icon_state = "bulb-broken" -/obj/machinery/light/broken/small/Initialize() +/obj/machinery/light/broken/small/Initialize(mapload) . = ..() broken() diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 6d7513f694..fb6e2b2c9a 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -126,7 +126,7 @@ var/temperature = 0 //The current temperature var/overheating = 0 //if this gets high enough the generator explodes -/obj/machinery/power/port_gen/pacman/Initialize() +/obj/machinery/power/port_gen/pacman/Initialize(mapload) . = ..() default_apply_parts() if(anchored) diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 9e7fa10cc3..70b696e344 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -93,7 +93,7 @@ var/power_gen = 1000 // Enough to power a single APC. 4000 output with T4 capacitor. var/irradiate = TRUE // RTGs irradiate surroundings, but only when panel is open. -/obj/machinery/power/rtg/Initialize() +/obj/machinery/power/rtg/Initialize(mapload) . = ..() if(ispath(circuit)) circuit = new circuit(src) @@ -251,7 +251,7 @@ /obj/machinery/power/rtg/abductor/built icon_state = "core" -/obj/machinery/power/rtg/abductor/built/Initialize() +/obj/machinery/power/rtg/abductor/built/Initialize(mapload) . = ..() cell = new(src) RefreshParts() @@ -265,7 +265,7 @@ /obj/machinery/power/rtg/abductor/hybrid/built icon_state = "coreb" -/obj/machinery/power/rtg/abductor/hybrid/built/Initialize() +/obj/machinery/power/rtg/abductor/hybrid/built/Initialize(mapload) . = ..() cell = new /obj/item/cell/void/hybrid(src) RefreshParts() @@ -329,7 +329,7 @@ interact_offline = TRUE density = FALSE -/obj/machinery/power/rtg/reg/Initialize() +/obj/machinery/power/rtg/reg/Initialize(mapload) pixel_x = -32 . = ..() @@ -460,7 +460,7 @@ var/time_per_sheet = 120 //fuel efficiency - how long 1 sheet lasts at power level 1 var/max_sheets = 100 //max capacity of the hopper -/obj/machinery/power/port_gen/large_altevian/Initialize() +/obj/machinery/power/port_gen/large_altevian/Initialize(mapload) .=..() if(anchored) connect_to_network() diff --git a/code/modules/power/privacy_switch.dm b/code/modules/power/privacy_switch.dm index 1552f8373b..0cfab0e137 100644 --- a/code/modules/power/privacy_switch.dm +++ b/code/modules/power/privacy_switch.dm @@ -5,7 +5,7 @@ icon_state = "privacy0" var/nextUse = 0 -/obj/structure/privacyswitch/Initialize() +/obj/structure/privacyswitch/Initialize(mapload) var/area/A = get_area(src) if(A?.flag_check(AREA_BLOCK_GHOST_SIGHT)) icon_state = "privacy1" diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm index bd2135b9a8..2cb81231e6 100644 --- a/code/modules/power/sensors/powernet_sensor.dm +++ b/code/modules/power/sensors/powernet_sensor.dm @@ -31,7 +31,7 @@ /obj/machinery/power/sensor/New() ..() auto_set_name() -/obj/machinery/power/sensor/Initialize() +/obj/machinery/power/sensor/Initialize(mapload) . = ..() history["supply"] = list() history["demand"] = list() diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 56d4e9704f..58116da3af 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -18,7 +18,7 @@ var/list/shockdirs var/hasShocked = 0 //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second. -/obj/machinery/containment_field/Initialize() +/obj/machinery/containment_field/Initialize(mapload) . = ..() shockdirs = list(turn(dir,90),turn(dir,-90)) sense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity)) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index a3737dd573..0fc411857b 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -50,7 +50,7 @@ src.set_dir(turn(src.dir, 90)) return 1 -/obj/machinery/power/emitter/Initialize() +/obj/machinery/power/emitter/Initialize(mapload) . = ..() if(state == 2 && anchored) connect_to_network() diff --git a/code/modules/power/singularity/emitter_vr.dm b/code/modules/power/singularity/emitter_vr.dm index 5b15d2ae81..be4d73e7b0 100644 --- a/code/modules/power/singularity/emitter_vr.dm +++ b/code/modules/power/singularity/emitter_vr.dm @@ -3,7 +3,7 @@ icon_state = "emitter0" var/previous_state = 0 -/obj/machinery/power/emitter/Initialize() +/obj/machinery/power/emitter/Initialize(mapload) . = ..() previous_state = state @@ -35,4 +35,3 @@ icon_state = "emitter_+a" else icon_state = "emitter" - diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index 477b7cc20d..65b843e287 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -27,7 +27,7 @@ var/max_storage = 3 // How many items can be jammed into it? var/list/recipes // The list containing the Particle Smasher's recipes. -/obj/machinery/particle_smasher/Initialize() +/obj/machinery/particle_smasher/Initialize(mapload) . = ..() storage = list() update_icon() diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 45009186bc..95afcae9dd 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(smeses) charge -= smes_amt return smes_amt / SMESRATE -/obj/machinery/power/smes/Initialize() +/obj/machinery/power/smes/Initialize(mapload) . = ..() GLOB.smeses += src add_nearby_terminals() diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index ba18e91413..afc03e1268 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -44,14 +44,14 @@ // These are used on individual outposts as backup should power line be cut, or engineering outpost lost power. // 1M Charge, 150K I/O -/obj/machinery/power/smes/buildable/outpost_substation/Initialize() +/obj/machinery/power/smes/buildable/outpost_substation/Initialize(mapload) . = ..() component_parts += new /obj/item/smes_coil/weak(src) recalc_coils() // This one is pre-installed on engineering shuttle. Allows rapid charging/discharging for easier transport of power to outpost // 11M Charge, 2.5M I/O -/obj/machinery/power/smes/buildable/power_shuttle/Initialize() +/obj/machinery/power/smes/buildable/power_shuttle/Initialize(mapload) . = ..() component_parts += new /obj/item/smes_coil/super_io(src) component_parts += new /obj/item/smes_coil/super_io(src) @@ -59,7 +59,7 @@ recalc_coils() // Pre-installed and pre-charged SMES hidden from the station, for use in submaps. -/obj/machinery/power/smes/buildable/point_of_interest/Initialize() +/obj/machinery/power/smes/buildable/point_of_interest/Initialize(mapload) . = ..() charge = capacity // Should be enough for an individual POI. RCon = FALSE diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 5304283e0a..7842c647a7 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -285,7 +285,7 @@ GLOBAL_LIST_EMPTY(solars_list) /obj/machinery/power/solar_control/config_start auto_start = SOLAR_AUTO_START_CONFIG -/obj/machinery/power/solar_control/Initialize() +/obj/machinery/power/solar_control/Initialize(mapload) . = ..() connect_to_network() set_panels(cdir) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 1da7d74295..583297968d 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -122,7 +122,7 @@ ..() uid = gl_uid++ -/obj/machinery/power/supermatter/Initialize() +/obj/machinery/power/supermatter/Initialize(mapload) soundloop = new(list(src), TRUE) if(src.z in using_map.station_levels) // CHOMPEdit: Looping Alarms stationcrystal = TRUE // CHOMPEdit: Looping Alarms diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index e2b586d294..4bb33b7626 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -33,7 +33,7 @@ ..() wires = new(src) -/obj/machinery/power/tesla_coil/Initialize() +/obj/machinery/power/tesla_coil/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 5efd620074..3d26b3427f 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -27,7 +27,7 @@ ..() miniball = is_miniball -/obj/singularity/energy_ball/Initialize() +/obj/singularity/energy_ball/Initialize(mapload) . = ..() if(!miniball) set_light(10, 7, "#EEEEFF") diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 982030a9d6..a3000a82c0 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -86,7 +86,7 @@ #define COMPFRICTION 5e5 #define COMPSTARTERLOAD 2800 -/obj/machinery/compressor/Initialize() +/obj/machinery/compressor/Initialize(mapload) . = ..() default_apply_parts() gas_contained = new() @@ -194,7 +194,7 @@ #define TURBGENQ 100000 #define TURBGENG 0.8 -/obj/machinery/power/turbine/Initialize() +/obj/machinery/power/turbine/Initialize(mapload) . = ..() default_apply_parts() // The outlet is pointed at the direction of the turbine component @@ -318,7 +318,7 @@ // Turbine Computer ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -/obj/machinery/computer/turbine_computer/Initialize() +/obj/machinery/computer/turbine_computer/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index 04102b62c2..6f15da0bd9 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -405,7 +405,7 @@ projectile_type = /obj/item/projectile/bullet/rifle/a145/highvel matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 1000) //CHOMPedit Makes them a bit more expensive -/obj/item/ammo_casing/a145/spent/Initialize() +/obj/item/ammo_casing/a145/spent/Initialize(mapload) . = ..() expend() diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm index 3eda477814..a13a13ed4b 100644 --- a/code/modules/projectiles/broken.dm +++ b/code/modules/projectiles/broken.dm @@ -17,7 +17,7 @@ return setup_repair_needs() -/obj/item/broken_gun/Initialize() +/obj/item/broken_gun/Initialize(mapload) . = ..() spawn(30 SECONDS) if(!my_guntype && !QDELETED(src)) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index f3c9d60132..f3a598f1fc 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -49,7 +49,7 @@ ..() //CHOMPEdit if you see this, it is a cry for help. Please tell people to stop putting ..() at the top of New() :( //CHOMPEdit Start -/obj/item/gun/energy/Initialize() +/obj/item/gun/energy/Initialize(mapload) . = ..() update_icon() //CHOMPEdit End diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index fab2a4bb51..efe6b91f78 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -20,7 +20,7 @@ var/obj/item/stock_parts/scanning_module/scanmod var/dropnoms_active = TRUE -/obj/item/bluespace_harpoon/Initialize() +/obj/item/bluespace_harpoon/Initialize(mapload) . = ..() scanmod = new(src) update_fail_chance() diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm index afa301f5e2..4b795ca4a4 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm @@ -223,7 +223,7 @@ var/type_name = null projectile_type = /obj/item/projectile/beam -/obj/item/ammo_casing/microbattery/Initialize() +/obj/item/ammo_casing/microbattery/Initialize(mapload) . = ..() pixel_x = rand(-10, 10) pixel_y = rand(-10, 10) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index 603e9480d7..88f961d19a 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -170,7 +170,7 @@ holds_charge = TRUE unique_frequency = TRUE -/obj/item/gun/energy/kinetic_accelerator/Initialize() +/obj/item/gun/energy/kinetic_accelerator/Initialize(mapload) . = ..() if(!holds_charge) empty() diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index eab2ddf7f6..8cd0d36884 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -165,7 +165,7 @@ /* var/remainingshots = 0 //you may get a limited number of shots regardless of the charge //CHOMPedit: no var/failurechance = 0 //chance per shot of something going awry -/obj/item/gun/energy/captain/Initialize() +/obj/item/gun/energy/captain/Initialize(mapload) //it's an antique and it's been sitting in a case, unmaintained, for who the hell knows how long - who knows what'll happen when you pull it out? ..() //first, we decide, does it have a different type of beam? 75% of just being a 40-damage laser, 15% of being less or 0, 10% of being better diff --git a/code/modules/projectiles/guns/energy/laser_ch.dm b/code/modules/projectiles/guns/energy/laser_ch.dm index 8173b633ad..efa83c956a 100644 --- a/code/modules/projectiles/guns/energy/laser_ch.dm +++ b/code/modules/projectiles/guns/energy/laser_ch.dm @@ -24,7 +24,7 @@ is_picked_up = FALSE update_transform() -/obj/item/gun/energy/laser/Initialize() +/obj/item/gun/energy/laser/Initialize(mapload) . = ..() if((!(type == /obj/item/gun/energy/laser)) && !is64x32_override) is64x32 = FALSE diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 01ca9b498c..e69f308059 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -64,7 +64,7 @@ list(mode_name="prune reagents", projectile_type=/obj/item/projectile/energy/floraprune, modifystate="floramut"), ) -/obj/item/gun/energy/floragun/Initialize() +/obj/item/gun/energy/floragun/Initialize(mapload) . = ..() emitter = new(src) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 2822a9155e..8e3084ac49 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -30,7 +30,7 @@ return new projectile_type(src) -/obj/item/gun/magic/Initialize() +/obj/item/gun/magic/Initialize(mapload) . = ..() charges = max_charges if(can_charge) diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index 167f4ea772..3c2b9666f0 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -15,7 +15,7 @@ else rating_modifier = FALSE -/obj/item/gun/magnetic/matfed/Initialize() +/obj/item/gun/magnetic/matfed/Initialize(mapload) . = ..() if(ispath(manipulator)) manipulator = new manipulator(src) @@ -196,7 +196,7 @@ else // rating_mod 0 = something's not right . += span_warning("A display on the side slowly scrolls the text \"ERR: MISSING COMPONENT - EFFICIENCY MODIFICATION INCOMPLETE\".") -/obj/item/gun/magnetic/matfed/phoronbore/Initialize() +/obj/item/gun/magnetic/matfed/phoronbore/Initialize(mapload) . = ..() soundloop = new(list(src), 0) diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm index abc39aa301..73d71016e6 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic.dm @@ -29,7 +29,7 @@ var/state = 0 -/obj/item/gun/magnetic/Initialize() +/obj/item/gun/magnetic/Initialize(mapload) . = ..() // So you can have some spawn with components if(ispath(cell)) diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun_ch.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun_ch.dm index 5ce46d85dd..ff534852cb 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun_ch.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun_ch.dm @@ -24,7 +24,7 @@ is_picked_up = FALSE update_transform() -/obj/item/gun/magnetic/railgun/Initialize() +/obj/item/gun/magnetic/railgun/Initialize(mapload) . = ..() if((!(type == /obj/item/gun/magnetic/railgun)) && !is64x32_override) is64x32 = FALSE diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 0d284656db..a9e38ca25f 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -428,7 +428,7 @@ icon_state = "mini-uzi-empty" // CHOMPEdit: Uzi tilting -/obj/item/gun/projectile/automatic/mini_uzi/Initialize() +/obj/item/gun/projectile/automatic/mini_uzi/Initialize(mapload) . = ..() if(is64x32) update_transform() diff --git a/code/modules/projectiles/guns/projectile/smartgun.dm b/code/modules/projectiles/guns/projectile/smartgun.dm index 0a8f70f8ac..b5cc169018 100644 --- a/code/modules/projectiles/guns/projectile/smartgun.dm +++ b/code/modules/projectiles/guns/projectile/smartgun.dm @@ -39,7 +39,7 @@ /obj/item/gun/projectile/smartgun/loaded magazine_type = /obj/item/ammo_magazine/smartgun -/obj/item/gun/projectile/smartgun/Initialize() +/obj/item/gun/projectile/smartgun/Initialize(mapload) . = ..() if(!mag_underlay) mag_underlay = mutable_appearance(icon, icon_state = "smartgun_mag") diff --git a/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm b/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm index f6bb984d52..936c73edef 100644 --- a/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm +++ b/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm @@ -32,7 +32,7 @@ //icon_scale_x = 0.5 //icon_scale_y = 0.5 -/obj/item/gun/projectile/automatic/cballistic/Initialize() +/obj/item/gun/projectile/automatic/cballistic/Initialize(mapload) . = ..() update_transform() @@ -71,7 +71,7 @@ var/is_picked_up = FALSE var/is_long = TRUE -/obj/item/gun/projectile/automatic/serdy/Initialize() +/obj/item/gun/projectile/automatic/serdy/Initialize(mapload) . = ..() update_transform() update_icon() @@ -1232,7 +1232,7 @@ icon_state = "c20r" return -/obj/item/gun/projectile/automatic/c20r/Initialize() +/obj/item/gun/projectile/automatic/c20r/Initialize(mapload) . = ..() update_transform() @@ -1251,7 +1251,7 @@ . = ..() icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-e" -/obj/item/gun/projectile/automatic/sts35/Initialize() +/obj/item/gun/projectile/automatic/sts35/Initialize(mapload) . = ..() update_transform() @@ -1270,7 +1270,7 @@ . = ..() icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-e" -/obj/item/gun/projectile/automatic/wt550/Initialize() +/obj/item/gun/projectile/automatic/wt550/Initialize(mapload) . = ..() update_transform() @@ -1293,7 +1293,7 @@ icon_state = "carbine-e" return -/obj/item/gun/projectile/automatic/z8/Initialize() +/obj/item/gun/projectile/automatic/z8/Initialize(mapload) . = ..() update_transform() @@ -1322,7 +1322,7 @@ . = ..() icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-empty" -/obj/item/gun/projectile/automatic/mini_uzi/Initialize() +/obj/item/gun/projectile/automatic/mini_uzi/Initialize(mapload) . = ..() update_transform() @@ -1396,7 +1396,7 @@ icon = 'icons/obj/gun_ch.dmi' icon_state = "m1911" -/obj/item/gun/projectile/colt/Initialize() +/obj/item/gun/projectile/colt/Initialize(mapload) .=..() update_icon() @@ -1576,7 +1576,7 @@ var/is64x32 = TRUE var/is_picked_up = FALSE -/obj/item/gun/projectile/shotgun/pump/Initialize() +/obj/item/gun/projectile/shotgun/pump/Initialize(mapload) . = ..() if(is64x32) update_transform() @@ -1671,7 +1671,7 @@ /obj/item/gun/projectile/shotgun/doublebarrel/sawn //Default sawn shotgun needs it's old icon path back icon = 'icons/obj/gun.dmi' -/obj/item/gun/projectile/shotgun/doublebarrel/Initialize() +/obj/item/gun/projectile/shotgun/doublebarrel/Initialize(mapload) . = ..() update_transform() update_icon() diff --git a/code/modules/projectiles/projectile/arc.dm b/code/modules/projectiles/projectile/arc.dm index d4d383bd14..71c342b392 100644 --- a/code/modules/projectiles/projectile/arc.dm +++ b/code/modules/projectiles/projectile/arc.dm @@ -21,7 +21,7 @@ /obj/item/projectile/arc/Bump() return -/obj/item/projectile/arc/Initialize() +/obj/item/projectile/arc/Initialize(mapload) shadow = new(get_turf(src)) return ..() diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index 45dcc70def..fbc756ee79 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -174,7 +174,7 @@ range = 6 hud_state = "plasma_rifle_blast" -/obj/item/projectile/bullet/magnetic/bore/Initialize(loc, range_mod) // i'm gonna be real honest i dunno how this works but it does +/obj/item/projectile/bullet/magnetic/bore/Initialize(mapload, range_mod) // i'm gonna be real honest i dunno how this works but it does . = ..() range += range_mod diff --git a/code/modules/reagents/hoses/connector.dm b/code/modules/reagents/hoses/connector.dm index 74d15146b2..6a5c26add0 100644 --- a/code/modules/reagents/hoses/connector.dm +++ b/code/modules/reagents/hoses/connector.dm @@ -52,7 +52,7 @@ carrier = null ..() -/obj/item/hose_connector/Initialize() +/obj/item/hose_connector/Initialize(mapload) . = ..() create_reagents(100) @@ -104,7 +104,7 @@ STOP_PROCESSING(SSobj, src) ..() -/obj/item/hose_connector/input/active/Initialize() +/obj/item/hose_connector/input/active/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -126,7 +126,7 @@ STOP_PROCESSING(SSobj, src) ..() -/obj/item/hose_connector/output/active/Initialize() +/obj/item/hose_connector/output/active/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/modules/reagents/machinery/dispenser/cartridge.dm b/code/modules/reagents/machinery/dispenser/cartridge.dm index e8f6a7bc6c..e78bcab747 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge.dm @@ -14,7 +14,7 @@ var/spawn_reagent = null var/label = "" -/obj/item/reagent_containers/chem_disp_cartridge/Initialize() +/obj/item/reagent_containers/chem_disp_cartridge/Initialize(mapload) . = ..() if(spawn_reagent) reagents.add_reagent(spawn_reagent, volume) diff --git a/code/modules/reagents/machinery/dispenser/dispenser2.dm b/code/modules/reagents/machinery/dispenser/dispenser2.dm index 5384e93f07..accf20bad4 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2.dm @@ -26,7 +26,7 @@ /// Saves all the recipes recorded by the machine var/list/saved_recipes = list() -/obj/machinery/chemical_dispenser/Initialize() +/obj/machinery/chemical_dispenser/Initialize(mapload) . = ..() if(spawn_cartridges) for(var/type in spawn_cartridges) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 002356141f..49d6bca3ca 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -28,7 +28,7 @@ ..() -/obj/structure/reagent_dispensers/Initialize() +/obj/structure/reagent_dispensers/Initialize(mapload) var/datum/reagents/R = new/datum/reagents(5000) reagents = R R.my_atom = src @@ -105,7 +105,7 @@ icon_state = "water" amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispensers/watertank/Initialize() +/obj/structure/reagent_dispensers/watertank/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 1000) @@ -114,7 +114,7 @@ desc = "A highly-pressurized water tank made to hold vast amounts of water.." icon_state = "water_high" -/obj/structure/reagent_dispensers/watertank/high/Initialize() +/obj/structure/reagent_dispensers/watertank/high/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 4000) @@ -132,7 +132,7 @@ var/modded = 0 var/obj/item/assembly_holder/rig = null -/obj/structure/reagent_dispensers/fueltank/Initialize() +/obj/structure/reagent_dispensers/fueltank/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FUEL,1000) @@ -141,7 +141,7 @@ desc = "A highly-pressurized fuel tank made to hold vast amounts of fuel." icon_state = "fuel_high" -/obj/structure/reagent_dispensers/fueltank/high/Initialize() +/obj/structure/reagent_dispensers/fueltank/high/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FUEL,4000) @@ -152,7 +152,7 @@ icon_state = "foam" amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispensers/foam/Initialize() +/obj/structure/reagent_dispensers/foam/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FIREFOAM,1000) @@ -163,7 +163,7 @@ icon_state = "he3" amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispenser/he3/Initialize() +/obj/structure/reagent_dispenser/he3/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HELIUM3,1000) @@ -304,7 +304,7 @@ density = FALSE amount_per_transfer_from_this = 45 -/obj/structure/reagent_dispensers/peppertank/Initialize() +/obj/structure/reagent_dispensers/peppertank/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN,1000) @@ -317,7 +317,7 @@ density = FALSE amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispensers/virusfood/Initialize() +/obj/structure/reagent_dispensers/virusfood/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_VIRUSFOOD, 1000) @@ -330,7 +330,7 @@ density = FALSE amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispensers/acid/Initialize() +/obj/structure/reagent_dispensers/acid/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SACID, 1000) @@ -352,7 +352,7 @@ cupholder = 1 cups = 10 -/obj/structure/reagent_dispensers/water_cooler/Initialize() +/obj/structure/reagent_dispensers/water_cooler/Initialize(mapload) . = ..() if(bottle) reagents.add_reagent(REAGENT_ID_WATER,2000) @@ -492,7 +492,7 @@ icon_state = "beertankTEMP" amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispensers/beerkeg/Initialize() +/obj/structure/reagent_dispensers/beerkeg/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BEER,1000) @@ -506,7 +506,7 @@ desc = "A wine casket with a tap on it." icon_state = "beertankfantasy" -/obj/structure/reagent_dispensers/beerkeg/wine/Initialize() +/obj/structure/reagent_dispensers/beerkeg/wine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_REDWINE,1000) @@ -524,7 +524,7 @@ icon_state = "oiltank" amount_per_transfer_from_this = 120 -/obj/structure/reagent_dispensers/cookingoil/Initialize() +/obj/structure/reagent_dispensers/cookingoil/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COOKINGOIL,5000) @@ -547,6 +547,6 @@ icon_state = "bloodbarrel" amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispensers/bloodbarrel/Initialize() +/obj/structure/reagent_dispensers/bloodbarrel/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLOOD, 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null)) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank_ch.dm b/code/modules/reagents/machinery/dispenser/reagent_tank_ch.dm index c026b81698..6b46a50991 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank_ch.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank_ch.dm @@ -6,6 +6,6 @@ amount_per_transfer_from_this = 60 anchored = 1 -/obj/structure/reagent_dispensers/space_cleaner/Initialize() +/obj/structure/reagent_dispensers/space_cleaner/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CLEANER, 1000) diff --git a/code/modules/reagents/machinery/distillery.dm b/code/modules/reagents/machinery/distillery.dm index 76f7529a61..6f1a0a5c0d 100644 --- a/code/modules/reagents/machinery/distillery.dm +++ b/code/modules/reagents/machinery/distillery.dm @@ -59,7 +59,7 @@ // A multiplier for the production amount. This should really only ever be lower than one, otherwise you end up with duping. var/efficiency = 1 -/obj/machinery/portable_atmospherics/powered/reagent_distillery/Initialize() +/obj/machinery/portable_atmospherics/powered/reagent_distillery/Initialize(mapload) . = ..() create_reagents(600, /datum/reagents/distilling) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index af58171705..551d5b2055 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -73,7 +73,7 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R // var/static/radial_juice = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_juice") // var/static/radial_mix = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_mix") -/obj/machinery/reagentgrinder/Initialize() +/obj/machinery/reagentgrinder/Initialize(mapload) . = ..() beaker = new /obj/item/reagent_containers/glass/beaker/large(src) default_apply_parts() diff --git a/code/modules/reagents/machinery/injector_maker.dm b/code/modules/reagents/machinery/injector_maker.dm index 36cd00fc59..6859ed89d3 100644 --- a/code/modules/reagents/machinery/injector_maker.dm +++ b/code/modules/reagents/machinery/injector_maker.dm @@ -30,7 +30,7 @@ var/capacity_plastic = 60000 // cost_plastic_large * 40 -/obj/machinery/injector_maker/Initialize() +/obj/machinery/injector_maker/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index d47e053486..c6808f1762 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -23,7 +23,7 @@ var/unlocked = 0 var/open = 0 -/obj/machinery/pump/Initialize() +/obj/machinery/pump/Initialize(mapload) create_reagents(200) . = ..() default_apply_parts() diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 32833767b2..957c67ba72 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -3,7 +3,7 @@ desc = "This box contains blood packs." icon_state = "sterile" -/obj/item/storage/box/bloodpacks/Initialize() +/obj/item/storage/box/bloodpacks/Initialize(mapload) . = ..() new /obj/item/reagent_containers/blood/empty(src) new /obj/item/reagent_containers/blood/empty(src) @@ -29,7 +29,7 @@ var/blood_type = null var/reag_id = REAGENT_ID_BLOOD -/obj/item/reagent_containers/blood/Initialize() +/obj/item/reagent_containers/blood/Initialize(mapload) . = ..() base_name = name base_desc = desc @@ -114,6 +114,6 @@ name = "Ration BloodPack" desc = "A standard issue BloodPack Ration given to crew that require blood to be sustained!" -/obj/item/reagent_containers/blood/random_bloodsucker/Initialize() +/obj/item/reagent_containers/blood/random_bloodsucker/Initialize(mapload) blood_type = pick("A+", "A-", "B+", "B-", "O-", "O+", "AB+", "AB-") . = ..() diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index bb19620ffa..2559849dd2 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -34,7 +34,7 @@ bypass_protection = TRUE // Because mercs tend to be in spacesuits. reagent_ids = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD) -/obj/item/reagent_containers/borghypo/Initialize() +/obj/item/reagent_containers/borghypo/Initialize(mapload) . = ..() for(var/T in reagent_ids) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index dd7ab49d40..1cf674bf5a 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -55,7 +55,7 @@ ) //CHOMP Addition for feeder in the above list. I am paranoid about comments within lists so this is outside. -/obj/item/reagent_containers/glass/Initialize() +/obj/item/reagent_containers/glass/Initialize(mapload) . = ..() if(LAZYLEN(prefill)) for(var/R in prefill) @@ -203,7 +203,7 @@ /obj/item/reagent_containers/glass/beaker/get_rating() return rating -/obj/item/reagent_containers/glass/beaker/Initialize() +/obj/item/reagent_containers/glass/beaker/Initialize(mapload) . = ..() desc += " Can hold up to [volume] units." diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 3f3a081b3f..3baa912044 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -21,7 +21,7 @@ var/list/filled_reagents = list() var/hyposound // What sound do we play on use? -/obj/item/reagent_containers/hypospray/Initialize() +/obj/item/reagent_containers/hypospray/Initialize(mapload) . = ..() if(filled) if(filled_reagents) @@ -102,7 +102,7 @@ var/obj/item/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name. volume = 0 -/obj/item/reagent_containers/hypospray/vial/Initialize() +/obj/item/reagent_containers/hypospray/vial/Initialize(mapload) . = ..() icon_state = "[initial(icon_state)]" loaded_vial = new /obj/item/reagent_containers/glass/beaker/vial(src) //Comes with an empty vial @@ -180,7 +180,7 @@ filled = 0 filled_reagents = list() -/obj/item/reagent_containers/hypospray/autoinjector/used/Initialize() +/obj/item/reagent_containers/hypospray/autoinjector/used/Initialize(mapload) . = ..() flags &= ~OPENCONTAINER icon_state = "[initial(icon_state)]0" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index adbbe13936..0e4c56c5ee 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -17,7 +17,7 @@ slot_flags = SLOT_EARS volume = 60 -/obj/item/reagent_containers/pill/Initialize() +/obj/item/reagent_containers/pill/Initialize(mapload) . = ..() if(!icon_state) icon_state = "[base_state][rand(1, 4)]" //preset pills only use colour changing or unique icons @@ -134,7 +134,7 @@ desc = "Neutralizes many common toxins." icon_state = "pill1" -/obj/item/reagent_containers/pill/antitox/Initialize() +/obj/item/reagent_containers/pill/antitox/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ANTITOXIN, 30) color = reagents.get_color() @@ -144,7 +144,7 @@ desc = "Highly toxic." icon_state = "pill4" -/obj/item/reagent_containers/pill/tox/Initialize() +/obj/item/reagent_containers/pill/tox/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TOXIN, 50) color = reagents.get_color() @@ -154,7 +154,7 @@ desc = "It's marked 'KCN'. Smells vaguely of almonds." icon_state = "pill9" -/obj/item/reagent_containers/pill/cyanide/Initialize() +/obj/item/reagent_containers/pill/cyanide/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CYANIDE, 50) @@ -164,7 +164,7 @@ desc = "It's magic. We don't have to explain it." icon_state = "pillA" -/obj/item/reagent_containers/pill/adminordrazine/Initialize() +/obj/item/reagent_containers/pill/adminordrazine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ADMINORDRAZINE, 5) @@ -174,7 +174,7 @@ desc = "Commonly used to treat insomnia." icon_state = "pill2" -/obj/item/reagent_containers/pill/stox/Initialize() +/obj/item/reagent_containers/pill/stox/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_STOXIN, 15) color = reagents.get_color() @@ -184,7 +184,7 @@ desc = "Used to treat burns." icon_state = "pill3" -/obj/item/reagent_containers/pill/kelotane/Initialize() +/obj/item/reagent_containers/pill/kelotane/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_KELOTANE, 20) color = reagents.get_color() @@ -194,7 +194,7 @@ desc = REAGENT_PARACETAMOL + "! A painkiller for the ages. Chewables!" icon_state = "pill3" -/obj/item/reagent_containers/pill/paracetamol/Initialize() +/obj/item/reagent_containers/pill/paracetamol/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PARACETAMOL, 15) color = reagents.get_color() @@ -204,7 +204,7 @@ desc = "A simple painkiller." icon_state = "pill3" -/obj/item/reagent_containers/pill/tramadol/Initialize() +/obj/item/reagent_containers/pill/tramadol/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TRAMADOL, 15) color = reagents.get_color() @@ -214,7 +214,7 @@ desc = "Improves the ability to concentrate." icon_state = "pill2" -/obj/item/reagent_containers/pill/methylphenidate/Initialize() +/obj/item/reagent_containers/pill/methylphenidate/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_METHYLPHENIDATE, 15) color = reagents.get_color() @@ -224,7 +224,7 @@ desc = "Mild anti-depressant." icon_state = "pill4" -/obj/item/reagent_containers/pill/citalopram/Initialize() +/obj/item/reagent_containers/pill/citalopram/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CITALOPRAM, 15) color = reagents.get_color() @@ -234,7 +234,7 @@ desc = "Used to treat oxygen deprivation." icon_state = "pill1" -/obj/item/reagent_containers/pill/dexalin/Initialize() +/obj/item/reagent_containers/pill/dexalin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DEXALIN, 7.5) color = reagents.get_color() @@ -244,7 +244,7 @@ desc = "Used to treat extreme oxygen deprivation." icon_state = "pill2" -/obj/item/reagent_containers/pill/dexalin_plus/Initialize() +/obj/item/reagent_containers/pill/dexalin_plus/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DEXALINP, 15) color = reagents.get_color() @@ -254,7 +254,7 @@ desc = "Used to treat burn wounds." icon_state = "pill2" -/obj/item/reagent_containers/pill/dermaline/Initialize() +/obj/item/reagent_containers/pill/dermaline/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_DERMALINE, 15) color = reagents.get_color() @@ -264,7 +264,7 @@ desc = "A broad-spectrum anti-toxin." icon_state = "pill1" -/obj/item/reagent_containers/pill/dylovene/Initialize() +/obj/item/reagent_containers/pill/dylovene/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15) color = reagents.get_color() @@ -274,7 +274,7 @@ desc = "Used to stabilize patients." icon_state = "pill2" -/obj/item/reagent_containers/pill/inaprovaline/Initialize() +/obj/item/reagent_containers/pill/inaprovaline/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_INAPROVALINE, 30) color = reagents.get_color() @@ -284,7 +284,7 @@ desc = "Used to treat physical injuries." icon_state = "pill2" -/obj/item/reagent_containers/pill/bicaridine/Initialize() +/obj/item/reagent_containers/pill/bicaridine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BICARIDINE, 20) color = reagents.get_color() @@ -294,7 +294,7 @@ desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space." icon_state = "pill3" -/obj/item/reagent_containers/pill/spaceacillin/Initialize() +/obj/item/reagent_containers/pill/spaceacillin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15) color = reagents.get_color() @@ -304,7 +304,7 @@ desc = "Used to neutralise chemicals in the stomach." icon_state = "pill3" -/obj/item/reagent_containers/pill/carbon/Initialize() +/obj/item/reagent_containers/pill/carbon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CARBON, 30) color = reagents.get_color() @@ -314,7 +314,7 @@ desc = "Used to aid in blood regeneration after bleeding for red-blooded crew." icon_state = "pill1" -/obj/item/reagent_containers/pill/iron/Initialize() +/obj/item/reagent_containers/pill/iron/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_IRON, 30) color = reagents.get_color() @@ -324,7 +324,7 @@ desc = "Used to aid in blood regeneration after bleeding for blue-blooded crew." icon_state = "pill1" -/obj/item/reagent_containers/pill/copper/Initialize() +/obj/item/reagent_containers/pill/copper/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COPPER, 30) color = reagents.get_color() @@ -335,7 +335,7 @@ desc = "Happy happy joy joy!" icon_state = "pill4" -/obj/item/reagent_containers/pill/happy/Initialize() +/obj/item/reagent_containers/pill/happy/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLISS, 15) reagents.add_reagent(REAGENT_ID_SUGAR, 15) @@ -346,7 +346,7 @@ desc = "Zoooom!" icon_state = "pill4" -/obj/item/reagent_containers/pill/zoom/Initialize() +/obj/item/reagent_containers/pill/zoom/Initialize(mapload) . = ..() if(prob(50)) //VOREStation edit begin: Zoom pill adjustments reagents.add_reagent(REAGENT_ID_MOLD, 2) //Chance to be more dangerous @@ -359,7 +359,7 @@ desc = "Guaranteed to get you slim!" icon_state = "pill4" -/obj/item/reagent_containers/pill/diet/Initialize() +/obj/item/reagent_containers/pill/diet/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_LIPOZINE, 15) color = reagents.get_color() @@ -371,7 +371,7 @@ desc = "Used to aid in blood regeneration after or during bleeding for crew with commonly found blood types." icon_state = "pill1" -/obj/item/reagent_containers/pill/small_blood_restoration/Initialize() +/obj/item/reagent_containers/pill/small_blood_restoration/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_IRON, 5) reagents.add_reagent(REAGENT_ID_COPPER, 5) @@ -384,7 +384,7 @@ desc = "Used to stabilize patients." icon_state = "pill2" -/obj/item/reagent_containers/pill/small_inaprovaline/Initialize() +/obj/item/reagent_containers/pill/small_inaprovaline/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_INAPROVALINE, 5) color = reagents.get_color() @@ -394,7 +394,7 @@ desc = "Used for the temporary cessation of radiation effects." icon_state = "pill2" -/obj/item/reagent_containers/pill/small_prussian_blue/Initialize() +/obj/item/reagent_containers/pill/small_prussian_blue/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PRUSSIANBLUE, 5) color = reagents.get_color() @@ -404,7 +404,7 @@ desc = "A reelatively moderate painkiller typically given for more severe injuries." icon_state = "pill2" -/obj/item/reagent_containers/pill/small_tramadol/Initialize() +/obj/item/reagent_containers/pill/small_tramadol/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TRAMADOL, 5) color = reagents.get_color() @@ -414,7 +414,7 @@ desc = "A rather weak painkiller typically given for minor injuries." icon_state = "pill3" -/obj/item/reagent_containers/pill/small_paracetamol/Initialize() +/obj/item/reagent_containers/pill/small_paracetamol/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5) color = reagents.get_color() @@ -424,7 +424,7 @@ desc = "A broad-spectrum anti-toxin." icon_state = "pill1" -/obj/item/reagent_containers/pill/small_dylovene/Initialize() +/obj/item/reagent_containers/pill/small_dylovene/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ANTITOXIN, 5) color = reagents.get_color() diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index 89e735d5fa..8968bbdc1d 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -3,7 +3,7 @@ desc = "Used to feed people on the field. Contains 30 units of " + REAGENT_NUTRIMENT + "." icon_state = "pill10" -/obj/item/reagent_containers/pill/nutriment/Initialize() +/obj/item/reagent_containers/pill/nutriment/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) @@ -12,7 +12,7 @@ desc = "Used to feed carnivores on the field. Contains 30 units of " + REAGENT_PROTEIN + "." icon_state = "pill24" -/obj/item/reagent_containers/pill/protein/Initialize() +/obj/item/reagent_containers/pill/protein/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 30) @@ -21,7 +21,7 @@ desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." icon_state = "pill2" -/obj/item/reagent_containers/pill/rezadone/Initialize() +/obj/item/reagent_containers/pill/rezadone/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_REZADONE, 5) color = reagents.get_color() @@ -31,7 +31,7 @@ desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." icon_state = "pill10" -/obj/item/reagent_containers/pill/peridaxon/Initialize() +/obj/item/reagent_containers/pill/peridaxon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PERIDAXON, 10) @@ -40,7 +40,7 @@ desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning." icon_state = "pill4" -/obj/item/reagent_containers/pill/carthatoline/Initialize() +/obj/item/reagent_containers/pill/carthatoline/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CARTHATOLINE, 15) color = reagents.get_color() @@ -50,7 +50,7 @@ desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." icon_state = "pill3" -/obj/item/reagent_containers/pill/alkysine/Initialize() +/obj/item/reagent_containers/pill/alkysine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ALKYSINE, 10) color = reagents.get_color() @@ -60,7 +60,7 @@ desc = "Heals eye damage." icon_state = "pill3" -/obj/item/reagent_containers/pill/imidazoline/Initialize() +/obj/item/reagent_containers/pill/imidazoline/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 15) color = reagents.get_color() @@ -70,7 +70,7 @@ desc = "An experimental drug used to heal bone fractures." icon_state = "pill2" -/obj/item/reagent_containers/pill/osteodaxon/Initialize() +/obj/item/reagent_containers/pill/osteodaxon/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_OSTEODAXON, 15) reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10) @@ -81,7 +81,7 @@ desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets." icon_state = "pill1" -/obj/item/reagent_containers/pill/myelamine/Initialize() +/obj/item/reagent_containers/pill/myelamine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_MYELAMINE, 15) reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10) @@ -92,7 +92,7 @@ desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning." icon_state = "pill4" -/obj/item/reagent_containers/pill/hyronalin/Initialize() +/obj/item/reagent_containers/pill/hyronalin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HYRONALIN, 15) color = reagents.get_color() @@ -102,7 +102,7 @@ desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning." icon_state = "pill2" -/obj/item/reagent_containers/pill/arithrazine/Initialize() +/obj/item/reagent_containers/pill/arithrazine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ARITHRAZINE, 5) color = reagents.get_color() @@ -112,7 +112,7 @@ desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." icon_state = "pill2" -/obj/item/reagent_containers/pill/corophizine/Initialize() +/obj/item/reagent_containers/pill/corophizine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COROPHIZINE, 5) color = reagents.get_color() @@ -122,7 +122,7 @@ desc = "An extremely potent drug to treat physical injuries." icon_state = "pill1" -/obj/item/reagent_containers/pill/vermicetol/Initialize() +/obj/item/reagent_containers/pill/vermicetol/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_VERMICETOL, 15) color = reagents.get_color() @@ -132,7 +132,7 @@ desc = "Miniature medical robots that swiftly restore bodily damage." icon_state = "pill1" -/obj/item/reagent_containers/pill/healing_nanites/Initialize() +/obj/item/reagent_containers/pill/healing_nanites/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_HEALINGNANITES, 30) color = reagents.get_color() @@ -143,7 +143,7 @@ desc = "A rare cure provided by Vey-Med that helps counteract negative side effects of using imperfect resleeving machinery." icon_state = "pill3" -/obj/item/reagent_containers/pill/sleevingcure/Initialize() +/obj/item/reagent_containers/pill/sleevingcure/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SLEEVINGCURE, 1) color = reagents.get_color() diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 230e2f6c72..105cad3849 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -20,7 +20,7 @@ var/list/spray_sizes = list(1,3) volume = 250 -/obj/item/reagent_containers/spray/Initialize() +/obj/item/reagent_containers/spray/Initialize(mapload) . = ..() src.verbs -= /obj/item/reagent_containers/verb/set_APTFT @@ -108,7 +108,7 @@ desc = "BLAM!-brand non-foaming space cleaner!" volume = 50 -/obj/item/reagent_containers/spray/cleaner/Initialize() +/obj/item/reagent_containers/spray/cleaner/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CLEANER, volume) @@ -116,7 +116,7 @@ name = REAGENT_ID_STERILIZINE desc = "Great for hiding incriminating bloodstains and sterilizing scalpels." -/obj/item/reagent_containers/spray/sterilizine/Initialize() +/obj/item/reagent_containers/spray/sterilizine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_STERILIZINE, volume) @@ -132,7 +132,7 @@ volume = 40 var/safety = TRUE -/obj/item/reagent_containers/spray/pepper/Initialize() +/obj/item/reagent_containers/spray/pepper/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40) @@ -164,7 +164,7 @@ drop_sound = 'sound/items/drop/herb.ogg' pickup_sound = 'sound/items/pickup/herb.ogg' -/obj/item/reagent_containers/spray/waterflower/Initialize() +/obj/item/reagent_containers/spray/waterflower/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_WATER, 10) @@ -212,7 +212,7 @@ item_state = "plantbgone" volume = 100 -/obj/item/reagent_containers/spray/plantbgone/Initialize() +/obj/item/reagent_containers/spray/plantbgone/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PLANTBGONE, 100) @@ -234,7 +234,7 @@ var/obj/item/hose_connector/input/active/InputSocket -/obj/item/reagent_containers/spray/chemsprayer/hosed/Initialize() +/obj/item/reagent_containers/spray/chemsprayer/hosed/Initialize(mapload) . = ..() InputSocket = new(src) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index dc3b18f4ee..ba0b23a30b 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -39,7 +39,7 @@ pickup_sound = 'sound/items/pickup/glass.ogg' -/obj/item/reagent_containers/syringe/Initialize() +/obj/item/reagent_containers/syringe/Initialize(mapload) . = ..() update_icon() @@ -354,7 +354,7 @@ name = "Syringe (inaprovaline)" desc = "Contains inaprovaline - used to stabilize patients." -/obj/item/reagent_containers/syringe/inaprovaline/Initialize() +/obj/item/reagent_containers/syringe/inaprovaline/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_INAPROVALINE, 15) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped @@ -364,7 +364,7 @@ name = "Syringe (anti-toxin)" desc = "Contains anti-toxins." -/obj/item/reagent_containers/syringe/antitoxin/Initialize() +/obj/item/reagent_containers/syringe/antitoxin/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped @@ -374,7 +374,7 @@ name = "Syringe (spaceacillin)" desc = "Contains antiviral agents." -/obj/item/reagent_containers/syringe/antiviral/Initialize() +/obj/item/reagent_containers/syringe/antiviral/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped @@ -384,7 +384,7 @@ name = "Syringe (drugs)" desc = "Contains aggressive drugs meant for torture." -/obj/item/reagent_containers/syringe/drugs/Initialize() +/obj/item/reagent_containers/syringe/drugs/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BLISS, 5) reagents.add_reagent(REAGENT_ID_MINDBREAKER, 5) @@ -392,7 +392,7 @@ //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped //update_icon() -/obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize() +/obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 50) mode = SYRINGE_INJECT @@ -402,7 +402,7 @@ name = "Syringe (anabolic steroids)" desc = "Contains drugs for muscle growth." -/obj/item/reagent_containers/syringe/steroid/Initialize() +/obj/item/reagent_containers/syringe/steroid/Initialize(mapload) . = ..() //reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks. reagents.add_reagent(REAGENT_ID_HYPERZINE,10) diff --git a/code/modules/reagents/reagent_containers/virology.dm b/code/modules/reagents/reagent_containers/virology.dm index 79765d83b6..0f8eef9cd9 100644 --- a/code/modules/reagents/reagent_containers/virology.dm +++ b/code/modules/reagents/reagent_containers/virology.dm @@ -9,7 +9,7 @@ name = "cold virus culture" desc = "A bottle with the common cold culture" -/obj/item/reagent_containers/glass/bottle/culture/cold/Initialize() +/obj/item/reagent_containers/glass/bottle/culture/cold/Initialize(mapload) . = ..() diseases += new /datum/disease/advance/cold data["viruses"] = diseases @@ -19,7 +19,7 @@ name = "flu virus culture" desc = "A bottle with the flu culture" -/obj/item/reagent_containers/glass/bottle/culture/flu/Initialize() +/obj/item/reagent_containers/glass/bottle/culture/flu/Initialize(mapload) . = ..() diseases += new /datum/disease/advance/flu data["viruses"] = diseases @@ -29,7 +29,7 @@ name = "blob spores culture" desc = "A bottle with blob spores" -/obj/item/reagent_containers/glass/bottle/culture/blobspores/Initialize() +/obj/item/reagent_containers/glass/bottle/culture/blobspores/Initialize(mapload) . = ..() diseases += new /datum/disease/advance/blobspores data["viruses"] = diseases @@ -39,7 +39,7 @@ name = "macrophages culture" desc = "A bottle with giant viruses" -/obj/item/reagent_containers/glass/bottle/culture/macrophages/Initialize() +/obj/item/reagent_containers/glass/bottle/culture/macrophages/Initialize(mapload) . = ..() diseases += new /datum/disease/advance/macrophage data["viruses"] = diseases @@ -49,7 +49,7 @@ name = "experimental disease culture bottle" desc = "A small bottle. Contains an untested viral culture." -/obj/item/reagent_containers/glass/bottle/culture/random_virus/Initialize() +/obj/item/reagent_containers/glass/bottle/culture/random_virus/Initialize(mapload) . = ..() diseases += new /datum/disease/advance/random data["viruses"] = diseases @@ -59,7 +59,7 @@ name = "minor experimental disease culture bottle" desc = "A small bottle. Contains a weak version of an untested viral culture." -/obj/item/reagent_containers/glass/bottle/culture/random_virus/minor/Initialize() +/obj/item/reagent_containers/glass/bottle/culture/random_virus/minor/Initialize(mapload) . = ..() diseases += new /datum/disease/advance/random/minor data["viruses"] = diseases diff --git a/code/modules/reagents/reagents/other_ch.dm b/code/modules/reagents/reagents/other_ch.dm index be8941999e..8978ac5cef 100644 --- a/code/modules/reagents/reagents/other_ch.dm +++ b/code/modules/reagents/reagents/other_ch.dm @@ -125,7 +125,7 @@ desc = "You probably shouldn't swallow this." icon_state = "pill2" -/obj/item/reagent_containers/pill/benzilate/Initialize() +/obj/item/reagent_containers/pill/benzilate/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BENZILATE, 50) color = reagents.get_color() @@ -136,7 +136,7 @@ desc = "Smells like... lilacs?" icon_state = "pill5" -/obj/item/reagent_containers/pill/phenethylamine/Initialize() +/obj/item/reagent_containers/pill/phenethylamine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PHENETHYLAMINE, 50) color = reagents.get_color() diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 89eec46509..fb73418b14 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -223,7 +223,7 @@ -/obj/machinery/conveyor_switch/Initialize() +/obj/machinery/conveyor_switch/Initialize(mapload) ..() update() return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index f57f45e9ba..abb4dd24d5 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -29,7 +29,7 @@ // create a new disposal // find the attached trunk (if present) and init gas resvr. -/obj/machinery/disposal/Initialize() +/obj/machinery/disposal/Initialize(mapload) . = ..() trunk = locate() in loc @@ -585,7 +585,7 @@ density = FALSE -/obj/machinery/disposal/wall/Initialize() +/obj/machinery/disposal/wall/Initialize(mapload) . = ..() spawn(1 SECOND) // Fixfix for weird interaction with buildmode or other late-spawning. @@ -1454,7 +1454,7 @@ icon_state = "pipe-t" var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet -/obj/structure/disposalpipe/trunk/Initialize() +/obj/structure/disposalpipe/trunk/Initialize(mapload) ..() dpdir = dir return INITIALIZE_HINT_LATELOAD @@ -1578,7 +1578,7 @@ var/mode = 0 var/launch_dist = 3 //CHOMPEdit -/obj/structure/disposaloutlet/Initialize() +/obj/structure/disposaloutlet/Initialize(mapload) . = ..() target = get_ranged_target_turf(src, dir, 10) diff --git a/code/modules/recycling/recycling.dm b/code/modules/recycling/recycling.dm index 0ea24bfb02..96ebbaf65d 100644 --- a/code/modules/recycling/recycling.dm +++ b/code/modules/recycling/recycling.dm @@ -8,7 +8,7 @@ var/negative_dir = null //VOREStation Addition var/hand_fed = TRUE //CHOMPAdd -/obj/machinery/recycling/Initialize() //CHOMPAdd +/obj/machinery/recycling/Initialize(mapload) //CHOMPAdd . = ..() default_apply_parts() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index a9e1db31ec..2baa2b85fe 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -394,7 +394,7 @@ var/c_mode = 0 -/obj/machinery/disposal/deliveryChute/Initialize() +/obj/machinery/disposal/deliveryChute/Initialize(mapload) . = ..() trunk = locate() in src.loc if(trunk) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 021a493bc5..f5de9cffc6 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -26,7 +26,7 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). idle_power_usage = 30 active_power_usage = 2500 -/obj/machinery/r_n_d/circuit_imprinter/Initialize() +/obj/machinery/r_n_d/circuit_imprinter/Initialize(mapload) . = ..() spawn() // Go through all materials, and add them to the possible storage, but hide them unless we contain them. diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 1fdb3c196c..ba8314dd16 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -17,7 +17,7 @@ Note: Must be placed within 3 tiles of the R&D Console active_power_usage = 2500 var/rped_recycler_ready = TRUE -/obj/machinery/r_n_d/destructive_analyzer/Initialize() +/obj/machinery/r_n_d/destructive_analyzer/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 18af42f7f9..10cddcc315 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -41,7 +41,7 @@ var/req_category = LATHE_ALL // CHOMPAdd - Departmental Lathes var/dep_overlay = null // CHOMPAdd - Departmental Lathes -/obj/machinery/r_n_d/protolathe/Initialize() +/obj/machinery/r_n_d/protolathe/Initialize(mapload) . = ..() // Go through all materials, and add them to the possible storage, but hide them unless we contain them. diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 2a2103ea74..0e284beaba 100755 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -119,7 +119,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, S.update_connections() break -/obj/machinery/computer/rdconsole/Initialize() +/obj/machinery/computer/rdconsole/Initialize(mapload) SyncRDevices() . = ..() diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index f14a9019fe..7c4790aea4 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -15,7 +15,7 @@ req_access = list(access_rd) //Only the R&D can change server settings. circuit = /obj/item/circuitboard/rdserver -/obj/machinery/r_n_d/server/Initialize() +/obj/machinery/r_n_d/server/Initialize(mapload) . = ..() default_apply_parts() @@ -29,7 +29,7 @@ tot_rating += SP.rating update_idle_power_usage(initial(idle_power_usage) / max(1, tot_rating)) -/obj/machinery/r_n_d/server/Initialize() +/obj/machinery/r_n_d/server/Initialize(mapload) . = ..() if(!files) files = new /datum/research(src) diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index 49c160179c..102432737f 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -35,7 +35,7 @@ var/gene_sequencing = FALSE // Traitgenes edit - create a dna injector for fixing dna, but don't let it be abusable -/obj/machinery/computer/transhuman/resleeving/Initialize() +/obj/machinery/computer/transhuman/resleeving/Initialize(mapload) . = ..() pods = list() spods = list() diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index f46eb47735..009f11e590 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -23,7 +23,7 @@ var/db_key var/datum/transcore_db/our_db // These persist all round and are never destroyed, just keep a hard ref -/obj/machinery/computer/transhuman/designer/Initialize() +/obj/machinery/computer/transhuman/designer/Initialize(mapload) . = ..() our_db = SStranscore.db_by_key(db_key) diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index 90b6dc8dfb..eff24a0f53 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -34,7 +34,7 @@ . = ..() src.db_key = db_key -/obj/item/implant/backup/Initialize() +/obj/item/implant/backup/Initialize(mapload) . = ..() our_db = SStranscore.db_by_key(db_key) diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 88fdddf970..336b269584 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -10,7 +10,7 @@ circuit = /obj/item/circuitboard/transhuman_clonepod //A full version of the pod -/obj/machinery/clonepod/transhuman/full/Initialize() +/obj/machinery/clonepod/transhuman/full/Initialize(mapload) . = ..() for(var/i = 1 to container_limit) containers += new /obj/item/reagent_containers/glass/bottle/biomass(src) diff --git a/code/modules/rogueminer_vr/zone_console.dm b/code/modules/rogueminer_vr/zone_console.dm index c8b5644ed3..c4479daedf 100644 --- a/code/modules/rogueminer_vr/zone_console.dm +++ b/code/modules/rogueminer_vr/zone_console.dm @@ -23,7 +23,7 @@ var/legacy_zone = 0 //Disable scanning and whatnot. var/obj/machinery/computer/shuttle_control/belter/shuttle_control -/obj/machinery/computer/roguezones/Initialize() +/obj/machinery/computer/roguezones/Initialize(mapload) . = ..() shuttle_control = locate(/obj/machinery/computer/shuttle_control/belter) return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/samples/container.dm b/code/modules/samples/container.dm index 5ca55298f8..0aef5333a9 100644 --- a/code/modules/samples/container.dm +++ b/code/modules/samples/container.dm @@ -49,11 +49,11 @@ can_hold.Add(/obj/item/storage/sample_container) //ditto, lockers and redemption machines -/obj/structure/closet/secure_closet/miner/Initialize() +/obj/structure/closet/secure_closet/miner/Initialize(mapload) . = ..() starts_with += /obj/item/storage/sample_container -/obj/structure/closet/secure_closet/xenoarchaeologist/Initialize() +/obj/structure/closet/secure_closet/xenoarchaeologist/Initialize(mapload) . = ..() starts_with += /obj/item/storage/sample_container diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm index f1e2d3fd53..b6297f80ae 100644 --- a/code/modules/shieldgen/directional_shield.dm +++ b/code/modules/shieldgen/directional_shield.dm @@ -98,7 +98,7 @@ var/high_color = "#0099FF" // Color the shield will be when at max health. A light blue. var/low_color = "#FF0000" // Color the shield will drift towards as health is lowered. Deep red. -/obj/item/shield_projector/Initialize() +/obj/item/shield_projector/Initialize(mapload) START_PROCESSING(SSobj, src) AddComponent(/datum/component/recursive_move) RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(moved_event)) diff --git a/code/modules/shieldgen/handheld_defuser.dm b/code/modules/shieldgen/handheld_defuser.dm index 825a829f8d..d5e118cb08 100644 --- a/code/modules/shieldgen/handheld_defuser.dm +++ b/code/modules/shieldgen/handheld_defuser.dm @@ -9,7 +9,7 @@ var/enabled = 0 -/obj/item/shield_diffuser/Initialize() +/obj/item/shield_diffuser/Initialize(mapload) . = ..() cell = new(src) diff --git a/code/modules/shieldgen/shield_diffuser.dm b/code/modules/shieldgen/shield_diffuser.dm index a76bfe7bb8..3928c34e22 100644 --- a/code/modules/shieldgen/shield_diffuser.dm +++ b/code/modules/shieldgen/shield_diffuser.dm @@ -14,7 +14,7 @@ var/alarm = 0 var/enabled = 1 -/obj/machinery/shield_diffuser/Initialize() +/obj/machinery/shield_diffuser/Initialize(mapload) . = ..() // TODO - Remove this bit once machines are converted to Initialize if(ispath(circuit)) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 1ad2c45c29..a9929bf047 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -32,7 +32,7 @@ desc = "A machine that generates a field of energy optimized for blocking meteorites when activated. This version comes with a more efficent shield matrix." energy_conversion_rate = 0.0012 -/obj/machinery/shield_gen/Initialize() +/obj/machinery/shield_gen/Initialize(mapload) if(anchored) for(var/obj/machinery/shield_capacitor/cap in range(1, src)) if(!cap.anchored) diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm index e6ac72c38f..114f7a96c2 100644 --- a/code/modules/shieldgen/shield_generator.dm +++ b/code/modules/shieldgen/shield_generator.dm @@ -50,7 +50,7 @@ set_light(0) -/obj/machinery/power/shield_generator/Initialize() +/obj/machinery/power/shield_generator/Initialize(mapload) . = ..() if(!wires) wires = new(src) diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 92e87dfbd4..0bb6d4faec 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -24,7 +24,7 @@ //Name of the shuttle, null for generic waypoint var/shuttle_restricted -/obj/effect/shuttle_landmark/Initialize() +/obj/effect/shuttle_landmark/Initialize(mapload) . = ..() if(docking_controller) . = INITIALIZE_HINT_LATELOAD @@ -124,7 +124,7 @@ flags = SLANDMARK_FLAG_AUTOSET var/original_name = null // Save our mapped-in name so we can rebuild our name when moving sectors. -/obj/effect/shuttle_landmark/automatic/Initialize() +/obj/effect/shuttle_landmark/automatic/Initialize(mapload) original_name = name landmark_tag += "-[x]-[y]-[z]-[random_id("landmarks",1,9999)]" return ..() @@ -137,7 +137,7 @@ /obj/effect/shuttle_landmark/automatic/clearing var/radius = 10 -/obj/effect/shuttle_landmark/automatic/clearing/Initialize() +/obj/effect/shuttle_landmark/automatic/clearing/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD @@ -152,7 +152,7 @@ /obj/effect/shuttle_landmark/shuttle_initializer var/datum/shuttle/shuttle_type -/obj/effect/shuttle_landmark/shuttle_initializer/Initialize() +/obj/effect/shuttle_landmark/shuttle_initializer/Initialize(mapload) . = ..() LAZYADD(SSshuttles.shuttles_to_initialize, shuttle_type) // queue up for init. diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm index 1e1ac99bb8..465c477275 100644 --- a/code/modules/shuttles/shuttles_web.dm +++ b/code/modules/shuttles/shuttles_web.dm @@ -171,7 +171,7 @@ // Note - Searching own area for doors/sensors is fine for legacy web shuttles as they are single-area. // However if this code is copied to future multi-area shuttles, should search in all shuttle areas -/obj/machinery/computer/shuttle_control/web/Initialize() +/obj/machinery/computer/shuttle_control/web/Initialize(mapload) . = ..() var/area/my_area = get_area(src) if(my_doors) @@ -407,7 +407,7 @@ var/shuttle_name //Text name of the shuttle to connect to var/list/destinations //Make sure this STARTS with a destination that builds a route to one that always exists as an anchor. -/obj/shuttle_connector/Initialize() +/obj/shuttle_connector/Initialize(mapload) . = ..() RegisterSignal(SSshuttles,COMSIG_OBSERVER_SHUTTLE_ADDED,PROC_REF(setup_routes)) diff --git a/code/modules/stockmarket/computer.dm b/code/modules/stockmarket/computer.dm index 245a95ac31..90d6c3553d 100644 --- a/code/modules/stockmarket/computer.dm +++ b/code/modules/stockmarket/computer.dm @@ -14,7 +14,7 @@ light_color = LIGHT_COLOR_GREEN -/obj/machinery/computer/stockexchange/Initialize() +/obj/machinery/computer/stockexchange/Initialize(mapload) . = ..() logged_in = "Cargo Department" diff --git a/code/modules/tables/presets_vr.dm b/code/modules/tables/presets_vr.dm index 8e045c7938..5e98361605 100644 --- a/code/modules/tables/presets_vr.dm +++ b/code/modules/tables/presets_vr.dm @@ -7,7 +7,7 @@ can_reinforce = FALSE can_plate = FALSE -/obj/structure/table/darkglass/Initialize() +/obj/structure/table/darkglass/Initialize(mapload) material = get_material_by_name(MAT_DARKGLASS) verbs -= /obj/structure/table/verb/do_flip verbs -= /obj/structure/table/proc/do_put @@ -45,6 +45,6 @@ icon_state = "plain_preview" color = "#FFFF00" -/obj/structure/table/gold/Initialize() +/obj/structure/table/gold/Initialize(mapload) material = get_material_by_name(MAT_GOLD) . = ..() diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 5cc05e9054..3507c1c1da 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -59,7 +59,7 @@ var/list/table_icon_cache = list() /obj/structure/table/blob_act() take_damage(100) -/obj/structure/table/Initialize() +/obj/structure/table/Initialize(mapload) . = ..() // One table per turf. diff --git a/code/modules/telesci/gps_advanced.dm b/code/modules/telesci/gps_advanced.dm index 8c812f0a9b..b265aa3cd0 100644 --- a/code/modules/telesci/gps_advanced.dm +++ b/code/modules/telesci/gps_advanced.dm @@ -14,7 +14,7 @@ gps_tag = "COM0" emped = 0 -/obj/item/gps/advanced/Initialize() +/obj/item/gps/advanced/Initialize(mapload) . = ..() add_overlay("working") diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 4f05339145..d793832225 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -21,7 +21,7 @@ var/map_pad_id = "" as text //what's my name var/map_pad_link_id = "" as text //who's my friend -/obj/machinery/power/quantumpad/Initialize() +/obj/machinery/power/quantumpad/Initialize(mapload) . = ..() default_apply_parts() connect_to_network() diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 1645a05ce7..834638944c 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -42,7 +42,7 @@ if(Adjacent(user)) . += "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots." -/obj/machinery/computer/telescience/Initialize() +/obj/machinery/computer/telescience/Initialize(mapload) . = ..() recalibrate() for(var/i = 1; i <= starting_crystals; i++) diff --git a/code/modules/turbolift/turbolift_map.dm b/code/modules/turbolift/turbolift_map.dm index 892b70b0d3..6800a9976c 100644 --- a/code/modules/turbolift/turbolift_map.dm +++ b/code/modules/turbolift/turbolift_map.dm @@ -19,7 +19,7 @@ turbolifts -= src return ..() -/obj/turbolift_map_holder/Initialize() +/obj/turbolift_map_holder/Initialize(mapload) ..() turbolifts += src return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 56644de18e..5d8b36d9db 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -59,7 +59,7 @@ //------------------------------------------- // Standard procs //------------------------------------------- -/obj/vehicle/train/security/engine/Initialize() +/obj/vehicle/train/security/engine/Initialize(mapload) cell = new /obj/item/cell/high(src) key = new key_type(src) . = ..() diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm index daa43bf24b..9c903554da 100644 --- a/code/modules/vehicles/bike.dm +++ b/code/modules/vehicles/bike.dm @@ -28,7 +28,7 @@ var/datum/effect/effect/system/ion_trail_follow/ion var/kickstand = 1 -/obj/vehicle/bike/Initialize() +/obj/vehicle/bike/Initialize(mapload) . = ..() cell = new /obj/item/cell/high(src) ion = new /datum/effect/effect/system/ion_trail_follow() @@ -37,12 +37,12 @@ icon_state = "[bike_icon]_off" update_icon() -/obj/vehicle/bike/built/Initialize() +/obj/vehicle/bike/built/Initialize(mapload) . = ..() qdel(cell) cell = null -/obj/vehicle/bike/random/Initialize() +/obj/vehicle/bike/random/Initialize(mapload) paint_color = rgb(rand(1,255),rand(1,255),rand(1,255)) . = ..() diff --git a/code/modules/vehicles/boat.dm b/code/modules/vehicles/boat.dm index 2e3f343933..49bf90c37c 100644 --- a/code/modules/vehicles/boat.dm +++ b/code/modules/vehicles/boat.dm @@ -13,8 +13,8 @@ var/datum/material/material = null var/riding_datum_type = /datum/riding/boat/small -/obj/vehicle/boat/sifwood/Initialize(newloc, material_name) - . = ..(newloc, MAT_SIFWOOD) +/obj/vehicle/boat/sifwood/Initialize(mapload, material_name) + . = ..(mapload, MAT_SIFWOOD) /obj/vehicle/boat/dragon name = "dragon boat" @@ -27,13 +27,13 @@ max_buckled_mobs = 5 riding_datum_type = /datum/riding/boat/big -/obj/vehicle/boat/dragon/Initialize(newloc, material_name) - . = ..(newloc, material_name) +/obj/vehicle/boat/dragon/Initialize(mapload, material_name) + . = ..(mapload, material_name) var/image/I = image(icon, src, "dragon_boat_underlay", BELOW_MOB_LAYER) underlays += I -/obj/vehicle/boat/dragon/sifwood/Initialize(newloc, material_name) - . = ..(newloc, MAT_SIFWOOD) +/obj/vehicle/boat/dragon/sifwood/Initialize(mapload, material_name) + . = ..(mapload, MAT_SIFWOOD) // Oars, which must be held inhand while in a boat to move it. /obj/item/oar @@ -45,11 +45,11 @@ force = 12 var/datum/material/material = null -/obj/item/oar/sifwood/Initialize(newloc, material_name) - . = ..(newloc, MAT_SIFWOOD) +/obj/item/oar/sifwood/Initialize(mapload, material_name) + . = ..(mapload, MAT_SIFWOOD) -/obj/item/oar/Initialize(newloc, material_name) - ..(newloc) +/obj/item/oar/Initialize(mapload, material_name) + ..(mapload) if(!material_name) material_name = MAT_WOOD material = get_material_by_name("[material_name]") @@ -58,8 +58,8 @@ color = material.icon_colour return INITIALIZE_HINT_NORMAL -/obj/vehicle/boat/Initialize(newloc, material_name) - ..(newloc) +/obj/vehicle/boat/Initialize(mapload, material_name) + ..(mapload) if(!material_name) material_name = MAT_WOOD material = get_material_by_name("[material_name]") diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index dcf4472d15..6bc9d170b5 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -42,7 +42,7 @@ //------------------------------------------- // Standard procs //------------------------------------------- -/obj/vehicle/train/engine/Initialize() +/obj/vehicle/train/engine/Initialize(mapload) . = ..() cell = new /obj/item/cell/high(src) key = new key_type(src) diff --git a/code/modules/vehicles/construction.dm b/code/modules/vehicles/construction.dm index 2be9c49cbc..a7a201a783 100644 --- a/code/modules/vehicles/construction.dm +++ b/code/modules/vehicles/construction.dm @@ -16,7 +16,7 @@ var/build_stage = 0 var/obj/item/cell/cell = null -/obj/item/vehicle_assembly/Initialize() +/obj/item/vehicle_assembly/Initialize(mapload) . = ..() icon_state = "[initial(icon_state)][build_stage]" update_icon() diff --git a/code/modules/vehicles/quad.dm b/code/modules/vehicles/quad.dm index e16b58de10..af026d2a5f 100644 --- a/code/modules/vehicles/quad.dm +++ b/code/modules/vehicles/quad.dm @@ -216,7 +216,7 @@ return 1 return 0 -/obj/vehicle/train/trolley/trailer/Initialize() +/obj/vehicle/train/trolley/trailer/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm index 72d6f4017b..5bb1e872c7 100644 --- a/code/modules/vehicles/rover_vr.dm +++ b/code/modules/vehicles/rover_vr.dm @@ -61,7 +61,7 @@ //------------------------------------------- // Standard procs //------------------------------------------- -/obj/vehicle/train/rover/engine/Initialize() +/obj/vehicle/train/rover/engine/Initialize(mapload) cell = new /obj/item/cell/high(src) key = new(src) . = ..() diff --git a/code/modules/vehicles/snowmobile.dm b/code/modules/vehicles/snowmobile.dm index dd45207fea..5cc7733a40 100644 --- a/code/modules/vehicles/snowmobile.dm +++ b/code/modules/vehicles/snowmobile.dm @@ -26,15 +26,15 @@ icon_state = "sno_keys" w_class = ITEMSIZE_TINY -/obj/vehicle/train/engine/quadbike/snowmobile/random/Initialize() +/obj/vehicle/train/engine/quadbike/snowmobile/random/Initialize(mapload) paint_color = rgb(rand(1,255),rand(1,255),rand(1,255)) . = ..() -/obj/vehicle/train/engine/quadbike/snowmobile/Initialize() +/obj/vehicle/train/engine/quadbike/snowmobile/Initialize(mapload) . = ..() riding_datum = new riding_datum_type(src) -/obj/vehicle/train/engine/quadbike/snowmobile/built/Initialize() +/obj/vehicle/train/engine/quadbike/snowmobile/built/Initialize(mapload) dir = 2 //To match the under construction frame . = ..() diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index 3c96d2f643..ac33902dd7 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -23,7 +23,7 @@ //------------------------------------------- // Standard procs //------------------------------------------- -/obj/vehicle/train/Initialize() +/obj/vehicle/train/Initialize(mapload) . = ..() for(var/obj/vehicle/train/T in orange(1, src)) if(latch_on_start) diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index a153f0f703..40010081f8 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -48,7 +48,7 @@ // Standard procs //------------------------------------------- //ChompADD START -/obj/vehicle/Initialize() +/obj/vehicle/Initialize(mapload) . = ..() soundloop = new(list(src), FALSE) //ChompADD END diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 8505a47899..c053d27532 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -365,7 +365,7 @@ return ..() + saving -/obj/belly/Initialize() +/obj/belly/Initialize(mapload) . = ..() //If not, we're probably just in a prefs list or something. if(ismob(loc)) diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index 817790d8c7..26ac2ea89b 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -100,7 +100,7 @@ name = "Ivy's Courier" desc = "A bag resembling something used by college students. Contains items for ''MooMoo''." -/obj/item/storage/backpack/messenger/sec/fluff/ivymoomoo/Initialize() +/obj/item/storage/backpack/messenger/sec/fluff/ivymoomoo/Initialize(mapload) . = ..() new /obj/item/clothing/head/beretg(src) new /obj/item/fluff/id_kit_ivy(src) @@ -140,7 +140,7 @@ slowdown = 0 can_tilt = 0 -/obj/item/storage/backpack/dufflebag/sec/fluff/joanrisu/Initialize() +/obj/item/storage/backpack/dufflebag/sec/fluff/joanrisu/Initialize(mapload) . = ..() new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src) @@ -157,7 +157,7 @@ desc = "A duffle bag Katarina uses to carry her tools." slowdown = 0 -/obj/item/storage/backpack/dufflebag/sec/fluff/katarina/Initialize() +/obj/item/storage/backpack/dufflebag/sec/fluff/katarina/Initialize(mapload) . = ..() new /obj/item/clothing/accessory/holster/hip(src) new /obj/item/clothing/suit/storage/fluff/fedcoat(src) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 31712e2bb9..eace15da55 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -750,7 +750,7 @@ storage_slots = 9 -/obj/item/storage/belt/utility/fluff/vulpine/Initialize() +/obj/item/storage/belt/utility/fluff/vulpine/Initialize(mapload) . = ..() new /obj/item/tool/screwdriver(src) new /obj/item/tool/wrench(src) diff --git a/code/modules/vore/fluffstuff/custom_implants_vr.dm b/code/modules/vore/fluffstuff/custom_implants_vr.dm index d1fed84bde..4ff63cd12c 100644 --- a/code/modules/vore/fluffstuff/custom_implants_vr.dm +++ b/code/modules/vore/fluffstuff/custom_implants_vr.dm @@ -306,7 +306,7 @@ filling_color = "#FDFFD1" volume = 12 -/obj/item/reagent_containers/food/snacks/egg/teshari/Initialize() +/obj/item/reagent_containers/food/snacks/egg/teshari/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_EGG, 10) bitesize = 2 @@ -409,7 +409,7 @@ filling_color = "#FDFFD1" volume = 12 -/obj/item/reagent_containers/food/snacks/egg/roiz/Initialize() +/obj/item/reagent_containers/food/snacks/egg/roiz/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_EGG, 9) bitesize = 2 @@ -439,7 +439,7 @@ icon_state = "friedegg" volume = 12 -/obj/item/reagent_containers/food/snacks/friedegg/roiz/Initialize() +/obj/item/reagent_containers/food/snacks/friedegg/roiz/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 9) bitesize = 2 @@ -451,7 +451,7 @@ icon_state = "egg_roiz" volume = 12 -/obj/item/reagent_containers/food/snacks/boiledegg/roiz/Initialize() +/obj/item/reagent_containers/food/snacks/boiledegg/roiz/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) bitesize = 2 @@ -466,7 +466,7 @@ nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5) volume = 18 -/obj/item/reagent_containers/food/snacks/chocolateegg/roiz/Initialize() +/obj/item/reagent_containers/food/snacks/chocolateegg/roiz/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 6) reagents.add_reagent(REAGENT_ID_COCO, 6) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index f2ab6186fc..17058cfab3 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -530,7 +530,7 @@ var/client/owner_c = null //They'll be dead when we message them probably. var/state = 0 //0 - New, 1 - Paired, 2 - Breaking, 3 - Broken (same as iconstates) -/obj/item/clothing/accessory/collar/khcrystal/Initialize() +/obj/item/clothing/accessory/collar/khcrystal/Initialize(mapload) . = ..() update_state(0) @@ -616,7 +616,7 @@ max_storage_space = ITEMSIZE_COST_SMALL * 2 w_class = ITEMSIZE_SMALL -/obj/item/storage/box/khcrystal/Initialize() +/obj/item/storage/box/khcrystal/Initialize(mapload) . = ..() new /obj/item/paper/khcrystal_manual(src) new /obj/item/clothing/accessory/collar/khcrystal(src) @@ -690,7 +690,7 @@ var/ambulance_state = FALSE var/ambulance_last_switch = 0 -/obj/item/storage/backpack/saddlebag/tempest/Initialize() +/obj/item/storage/backpack/saddlebag/tempest/Initialize(mapload) soundloop = new(list(src), FALSE) return ..() @@ -927,7 +927,7 @@ var/wielded = 0 var/base_name = "stunstaff" -/obj/item/melee/baton/fluff/stunstaff/Initialize() +/obj/item/melee/baton/fluff/stunstaff/Initialize(mapload) . = ..() bcell = new/obj/item/cell/device/weapon(src) update_icon() @@ -996,7 +996,7 @@ max_w_class = ITEMSIZE_HUGE max_storage_space = 16 -/obj/item/storage/backpack/fluff/stunstaff/Initialize() +/obj/item/storage/backpack/fluff/stunstaff/Initialize(mapload) . = ..() new /obj/item/melee/baton/fluff/stunstaff(src) @@ -1156,7 +1156,7 @@ name = "flask of expensive alcohol" desc = "A standard vacuum-flask filled with good and expensive drink." -/obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize() +/obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PWINE, 60) @@ -1272,7 +1272,7 @@ filling_states = list(15, 30, 50, 60, 80, 100) volume = 60 -/obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize() +/obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TEA, 40) reagents.add_reagent(REAGENT_ID_MILK, 20) @@ -1349,7 +1349,7 @@ End CHOMP Removal*/ w_class = ITEMSIZE_TINY starts_with = list(/obj/item/clothing/mask/smokable/cigarette = 7) -/obj/item/storage/fancy/fluff/charlotte/Initialize() +/obj/item/storage/fancy/fluff/charlotte/Initialize(mapload) if(!open_state) open_state = "[initial(icon_state)]0" if(!closed_state) @@ -1400,7 +1400,7 @@ End CHOMP Removal*/ icon_state = "bottle3" prefill = list(REAGENT_ID_BICARIDINE = 30, REAGENT_ID_NUTRIMENT = 30) -/obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize() +/obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize(mapload) . = ..() hold.max_storage_space = ITEMSIZE_COST_SMALL * 2 hold.can_hold = list(/obj/item/material/knife, /obj/item/reagent_containers/glass/bottle) @@ -1559,7 +1559,7 @@ End CHOMP Removal*/ ..() icon_state = "ceph_d6[result]" -/obj/item/dice/loaded/ceph/Initialize() +/obj/item/dice/loaded/ceph/Initialize(mapload) . = ..() icon_state = "ceph_d6[rand(1,sides)]" diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm index baa0adcf8e..846696ca5b 100644 --- a/code/modules/vore/fluffstuff/custom_items_yw.dm +++ b/code/modules/vore/fluffstuff/custom_items_yw.dm @@ -539,7 +539,7 @@ desc = "DAS A BIG COOKIE!!!" bitesize = 100 -/obj/item/reagent_containers/food/snacks/cookie/mysterious/Initialize() +/obj/item/reagent_containers/food/snacks/cookie/mysterious/Initialize(mapload) . = ..() /obj/item/reagent_containers/food/snacks/cookie/mysterious/attack(mob/living/M as mob, mob/user as mob, def_zone) diff --git a/code/modules/vore/fluffstuff/custom_mecha_vr.dm b/code/modules/vore/fluffstuff/custom_mecha_vr.dm index 99d9d5cacc..7b442c4680 100644 --- a/code/modules/vore/fluffstuff/custom_mecha_vr.dm +++ b/code/modules/vore/fluffstuff/custom_mecha_vr.dm @@ -7,7 +7,7 @@ icon = 'icons/mecha/mecha_vr.dmi' -/obj/mecha/combat/phazon/scree/Initialize() +/obj/mecha/combat/phazon/scree/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser ME.attach(src) diff --git a/code/modules/vore/resizing/crackers.dm b/code/modules/vore/resizing/crackers.dm index 5d02bdc4dc..22e0da143f 100644 --- a/code/modules/vore/resizing/crackers.dm +++ b/code/modules/vore/resizing/crackers.dm @@ -123,7 +123,7 @@ J.info = joke qdel(src) -/obj/item/cracker/Initialize() +/obj/item/cracker/Initialize(mapload) var/list/styles = list("blue","green","yellow","red","heart","hazard") var/style = pick(styles) icon_state = style @@ -168,7 +168,7 @@ body_parts_covered = 0 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/head/paper_crown/Initialize() +/obj/item/clothing/head/paper_crown/Initialize(mapload) var/list/styles = list("paper_crown_blue","paper_crown_green","paper_crown_yellow","paper_crown_red","paper_crown_pink") var/style = pick(styles) icon_state = style diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 0a49bb6628..af16017d91 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -24,7 +24,7 @@ fire_sound = 'sound/weapons/pulse3.ogg' )) -/obj/item/gun/energy/sizegun/Initialize() +/obj/item/gun/energy/sizegun/Initialize(mapload) . = ..() verbs += /obj/item/gun/energy/sizegun/proc/select_size verbs += /obj/item/gun/energy/sizegun/proc/spin_dial diff --git a/code/modules/xenoarcheaology/anomaly_container.dm b/code/modules/xenoarcheaology/anomaly_container.dm index e725254f0b..68a85661dd 100644 --- a/code/modules/xenoarcheaology/anomaly_container.dm +++ b/code/modules/xenoarcheaology/anomaly_container.dm @@ -7,7 +7,7 @@ var/obj/machinery/artifact/contained -/obj/structure/anomaly_container/Initialize() +/obj/structure/anomaly_container/Initialize(mapload) . = ..() var/obj/machinery/artifact/A = locate() in loc @@ -53,4 +53,3 @@ if(!QDELETED(src) && istype(loc, /turf) && is_anomalous() && Adjacent(over_object) && CanMouseDrop(over_object, usr)) Bumped(usr) over_object.contain(src) - diff --git a/code/modules/xenoarcheaology/artifacts/crystal.dm b/code/modules/xenoarcheaology/artifacts/crystal.dm index 3239aaa668..dde32e05c1 100644 --- a/code/modules/xenoarcheaology/artifacts/crystal.dm +++ b/code/modules/xenoarcheaology/artifacts/crystal.dm @@ -4,7 +4,7 @@ icon_state = "crystal" density = TRUE -/obj/structure/crystal/Initialize() +/obj/structure/crystal/Initialize(mapload) . = ..() icon_state = pick("ano70","ano80") diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm index 4d32427e76..5f36e52679 100644 --- a/code/modules/xenoarcheaology/boulder.dm +++ b/code/modules/xenoarcheaology/boulder.dm @@ -11,7 +11,7 @@ var/datum/artifact_find/artifact_find var/last_act = 0 -/obj/structure/boulder/Initialize() +/obj/structure/boulder/Initialize(mapload) . = ..() icon_state = "boulder[rand(1,4)]" excavation_level = rand(5, 50) diff --git a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm index 8cd1198b32..449e82729e 100644 --- a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm +++ b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm @@ -36,7 +36,7 @@ var/consecration_cost = 10 //Ten stored_blood per use! var/empowered = FALSE //If our next atack is empowered (2x damage) -/obj/item/melee/artifact_blade/Initialize() //We will never spawn without xenoarch or SOMEONE unearthing us. +/obj/item/melee/artifact_blade/Initialize(mapload) //We will never spawn without xenoarch or SOMEONE unearthing us. . = ..() //START_PROCESSING(SSobj, src) //We could start processing here, but let's wait until someone touches us. Uncomment this if more stuff is added and you want it to do spooky passive things. diff --git a/code/modules/xenoarcheaology/finds/misc.dm b/code/modules/xenoarcheaology/finds/misc.dm index 53948b87f1..76cafb7296 100644 --- a/code/modules/xenoarcheaology/finds/misc.dm +++ b/code/modules/xenoarcheaology/finds/misc.dm @@ -39,7 +39,7 @@ anchored = TRUE catalogue_data = list(/datum/category_item/catalogue/material/regular_crystal) -/obj/machinery/crystal/Initialize() +/obj/machinery/crystal/Initialize(mapload) randomize_color() return ..() diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index c07da9ce34..f85b1c25b9 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -5,7 +5,7 @@ /obj/item/reagent_containers/glass/replenishing var/spawning_id -/obj/item/reagent_containers/glass/replenishing/Initialize() +/obj/item/reagent_containers/glass/replenishing/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) //Taken from hydroponics/seed.dm...This should be a global list at some point and reworked in both places. diff --git a/code/modules/xenoarcheaology/misc.dm b/code/modules/xenoarcheaology/misc.dm index ddc36c67db..64a005b380 100644 --- a/code/modules/xenoarcheaology/misc.dm +++ b/code/modules/xenoarcheaology/misc.dm @@ -1,7 +1,7 @@ /obj/structure/bookcase/manuals/xenoarchaeology name = "Xenoarchaeology Manuals bookcase" -/obj/structure/bookcase/manuals/xenoarchaeology/Initialize() +/obj/structure/bookcase/manuals/xenoarchaeology/Initialize(mapload) . = ..() new /obj/item/book/manual/excavation(src) new /obj/item/book/manual/mass_spectrometry(src) diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index 75e7378aa2..fb18b0e89e 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -8,7 +8,7 @@ sharp = TRUE var/datum/geosample/geological_data -/obj/item/rocksliver/Initialize() +/obj/item/rocksliver/Initialize(mapload) . = ..() icon_state = "sliver[rand(1, 3)]" randpixel_xy() diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 5515f775fa..7d30b05672 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -23,7 +23,7 @@ /obj/machinery/replicator, /obj/structure/crystal) -/obj/machinery/artifact_analyser/Initialize() +/obj/machinery/artifact_analyser/Initialize(mapload) . = ..() reconnect_scanner() diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index 2619aab7ed..4219889aa2 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -17,7 +17,7 @@ circuit = /obj/item/circuitboard/artifact_harvester /// If you want it to load smoothly, set it's dir to wherever the scanpad is! -/obj/machinery/artifact_harvester/Initialize() +/obj/machinery/artifact_harvester/Initialize(mapload) . = ..() owned_scanner = locate(/obj/machinery/artifact_scanpad) in get_step(src, dir) if(!owned_scanner) diff --git a/code/modules/xenoarcheaology/tools/artifact_scanner.dm b/code/modules/xenoarcheaology/tools/artifact_scanner.dm index 1aa0fe5165..63395b9ce9 100644 --- a/code/modules/xenoarcheaology/tools/artifact_scanner.dm +++ b/code/modules/xenoarcheaology/tools/artifact_scanner.dm @@ -15,7 +15,7 @@ if(default_part_replacement(user, I)) return -/obj/machinery/artifact_scanpad/Initialize() +/obj/machinery/artifact_scanpad/Initialize(mapload) . = ..() default_apply_parts() update_icon() diff --git a/code/modules/xenoarcheaology/tools/coolant_tank.dm b/code/modules/xenoarcheaology/tools/coolant_tank.dm index acb776a657..23c9253a06 100644 --- a/code/modules/xenoarcheaology/tools/coolant_tank.dm +++ b/code/modules/xenoarcheaology/tools/coolant_tank.dm @@ -5,7 +5,7 @@ icon_state = "coolanttank" amount_per_transfer_from_this = 10 -/obj/structure/reagent_dispensers/coolanttank/Initialize() +/obj/structure/reagent_dispensers/coolanttank/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_COOLANT, 1000) diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 0ee13036bc..6d0a9509b8 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -11,7 +11,7 @@ var/power_use = 5 var/obj/effect/suspension_field/suspension_field -/obj/machinery/suspension_gen/Initialize() +/obj/machinery/suspension_gen/Initialize(mapload) . = ..() cell = new /obj/item/cell/high(src) diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index e2c9792c32..b7ff13056e 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -16,7 +16,7 @@ flags = OPENCONTAINER -/obj/item/slime_extract/Initialize() +/obj/item/slime_extract/Initialize(mapload) . = ..() create_reagents(60) diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index 609b32705d..732a438af5 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -123,7 +123,7 @@ nutriment_amt = 25 // Very filling. nutriment_desc = list("slime" = 10, "sweetness" = 10, REAGENT_ID_BLISS = 5) -/obj/item/reagent_containers/food/snacks/slime/Initialize() +/obj/item/reagent_containers/food/snacks/slime/Initialize(mapload) . = ..() bitesize = 5 @@ -144,7 +144,7 @@ power_use = 0 light_system = STATIC_LIGHT -/obj/item/flashlight/slime/Initialize() +/obj/item/flashlight/slime/Initialize(mapload) . = ..() set_light(light_range, light_power, light_color) @@ -167,7 +167,7 @@ light_range = 2 w_class = ITEMSIZE_TINY -/obj/item/slime_irradiator/Initialize() +/obj/item/slime_irradiator/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) set_light(light_range, light_power, light_color) diff --git a/code/modules/xenobio/items/weapons.dm b/code/modules/xenobio/items/weapons.dm index ad260355e4..96f08073c1 100644 --- a/code/modules/xenobio/items/weapons.dm +++ b/code/modules/xenobio/items/weapons.dm @@ -28,7 +28,7 @@ H.apply_damage(agony_to_apply, HALLOSS) ..() -/obj/item/melee/baton/slime/loaded/Initialize() +/obj/item/melee/baton/slime/loaded/Initialize(mapload) bcell = new/obj/item/cell/device(src) update_icon() return ..() diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm index 59d2744446..df9003b047 100644 --- a/code/modules/xenobio2/machinery/core_extractor.dm +++ b/code/modules/xenobio2/machinery/core_extractor.dm @@ -18,7 +18,7 @@ var/operatingcolor = "#FFFF22" -/obj/machinery/slime/extractor/Initialize() +/obj/machinery/slime/extractor/Initialize(mapload) . = ..() default_apply_parts() update_light_color() diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index 6cbcde52ff..f4c8208b1c 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -123,7 +123,7 @@ var/datum/xeno/traits/genetics // Currently scanned xeno genetic structure. var/degradation = 0 // Increments with each scan, stops allowing gene mods after a certain point. -/obj/machinery/xenobio/extractor/Initialize() +/obj/machinery/xenobio/extractor/Initialize(mapload) . = ..() default_apply_parts() @@ -258,7 +258,7 @@ var/mob/living/simple_mob/xeno/slime/occupant -/obj/machinery/xenobio/editor/Initialize() +/obj/machinery/xenobio/editor/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm index 9fd64a9962..e784452358 100644 --- a/code/modules/xenobio2/machinery/injector.dm +++ b/code/modules/xenobio2/machinery/injector.dm @@ -19,7 +19,7 @@ circuit = /obj/item/circuitboard/xenobioinjectormachine -/obj/machinery/xenobio2/manualinjector/Initialize() +/obj/machinery/xenobio2/manualinjector/Initialize(mapload) . = ..() var/datum/reagents/R = new/datum/reagents(1000) reagents = R diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm index d08af1c795..4ce92e8aa1 100644 --- a/code/modules/xenobio2/machinery/slime_replicator.dm +++ b/code/modules/xenobio2/machinery/slime_replicator.dm @@ -17,7 +17,7 @@ var/emptycolor = "#FF2222" var/operatingcolor = "#FFFF22" -/obj/machinery/slime/replicator/Initialize() +/obj/machinery/slime/replicator/Initialize(mapload) . = ..() default_apply_parts() update_light_color() diff --git a/maps/common/common_things.dm b/maps/common/common_things.dm new file mode 100644 index 0000000000..b53a830cd6 --- /dev/null +++ b/maps/common/common_things.dm @@ -0,0 +1,407 @@ +/obj/effect/step_trigger/teleporter/to_mining + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + +/obj/effect/step_trigger/teleporter/from_mining + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + +/obj/effect/step_trigger/teleporter/to_solars + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/teleporter/from_solars + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/teleporter/wild + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/teleporter/to_underdark + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/teleporter/from_underdark + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/teleporter/to_plains + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/teleporter/from_plains + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + +/obj/effect/step_trigger/lost_in_space + icon = 'icons/obj/structures/stairs_64x64.dmi' + icon_state = "" + invisibility = 0 + var/deathmessage = "You drift off into space, floating alone in the void until your life support runs out." + +/obj/effect/step_trigger/lost_in_space/Trigger(var/atom/movable/A) //replacement for shuttle dump zones because there's no empty space levels to dump to + if(ismob(A)) + to_chat(A, span_danger("[deathmessage]")) + qdel(A) + +/obj/effect/step_trigger/lost_in_space/bluespace + deathmessage = "Everything goes blue as your component particles are scattered throughout the known and unknown universe." + var/last_sound = 0 + +/obj/effect/step_trigger/lost_in_space/bluespace/Trigger(A) + if(world.time - last_sound > 5 SECONDS) + last_sound = world.time + playsound(src, 'sound/effects/supermatter.ogg', 75, 1) + if(ismob(A) && prob(5))//lucky day + var/destturf = locate(rand(5,world.maxx-5),rand(5,world.maxy-5),pick(using_map.station_levels)) + new /datum/teleport/instant(A, destturf, 0, 1, null, null, null, 'sound/effects/phasein.ogg') + else + return ..() + +/obj/effect/step_trigger/lost_in_space/tram + deathmessage = "You fly down the tunnel of the tram at high speed for a few moments before impact kills you with sheer concussive force." + +// +// TRAM STATION +// + +// The tram's electrified maglev tracks +/turf/simulated/floor/maglev + name = "maglev track" + desc = "Magnetic levitation tram tracks. Caution! Electrified!" + icon = 'icons/turf/flooring/maglevs.dmi' + icon_state = "maglevup" + can_be_plated = FALSE + + var/area/shock_area = /area/tether/surfacebase/tram + +/turf/simulated/floor/maglev/Initialize(mapload) + . = ..() + shock_area = locate(shock_area) + +// Walking on maglev tracks will shock you! Horray! +/turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc) + if(isliving(AM) && !(AM.is_incorporeal()) && prob(50)) + track_zap(AM) + +/turf/simulated/floor/maglev/attack_hand(var/mob/user) + if(prob(75)) + track_zap(user) + +/turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user) + if (!istype(user)) return + if (electrocute_mob(user, shock_area, src)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + +// Tram air scrubbers for keeping arrivals clean - they work even with no area power +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram + name = "\improper Tram Air Scrubber" + icon_state = "scrubber:1" + on = TRUE + +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram/powered() + return TRUE // Always be powered + +// Tram departure cryo doors that turn into ordinary airlock doors at round end +/obj/machinery/cryopod/robot/door/tram + name = "\improper Tram Station" + icon = 'icons/obj/doors/Doorextglass.dmi' + icon_state = "door_closed" + can_atmos_pass = ATMOS_PASS_NO + base_icon_state = "door_closed" + occupied_icon_state = "door_locked" + desc = "The tram station you might've came in from. You could leave the base easily using this." + on_store_message = "has departed on the tram." + on_store_name = "Travel Oversight" + on_enter_occupant_message = "The tram arrives at the platform; you step inside and take a seat." + on_store_visible_message_1 = "'s speakers chime, anouncing a tram has arrived to take" + on_store_visible_message_2 = "to the colony" + time_till_despawn = 10 SECONDS + spawnpoint_type = /datum/spawnpoint/tram + +/obj/machinery/cryopod/robot/door/tram/process() + if(emergency_shuttle.online() || emergency_shuttle.returned()) + // Transform into a door! But first despawn anyone inside + time_till_despawn = 0 + ..() + var/turf/T = get_turf(src) + var/obj/machinery/door/airlock/glass_external/door = new(T) + door.req_access = null + door.req_one_access = null + qdel(src) + // Otherwise just operate normally + return ..() + +/obj/machinery/cryopod/robot/door/tram/Bumped(var/atom/movable/AM) + if(!ishuman(AM)) + return + + var/mob/living/carbon/human/user = AM + + var/choice = tgui_alert(user, "Do you want to depart via the tram? Your character will leave the round.","Departure",list("Yes","No")) + if(user && Adjacent(user) && choice == "Yes") + var/mob/observer/dead/newghost = user.ghostize() + newghost.timeofdeath = world.time + despawn_occupant(user) + +// +// Holodorms +// +/obj/machinery/computer/HolodeckControl/holodorm + name = "Don't use this one!!!" + powerdown_program = "Off" + default_program = "Off" + + //Smollodeck + active_power_usage = 500 + item_power_usage = 100 + + supported_programs = list( + "Off" = new/datum/holodeck_program(/area/holodeck/holodorm/source_off), + "Basic Dorm" = new/datum/holodeck_program(/area/holodeck/holodorm/source_basic), + "Table Seating" = new/datum/holodeck_program(/area/holodeck/holodorm/source_seating), + "Beach Sim" = new/datum/holodeck_program(/area/holodeck/holodorm/source_beach), + "Desert Area" = new/datum/holodeck_program(/area/holodeck/holodorm/source_desert), + "Snow Field" = new/datum/holodeck_program(/area/holodeck/holodorm/source_snow), + "Flower Garden" = new/datum/holodeck_program(/area/holodeck/holodorm/source_garden), + "Space Sim" = new/datum/holodeck_program(/area/holodeck/holodorm/source_space), + "Boxing Ring" = new/datum/holodeck_program(/area/holodeck/holodorm/source_boxing) + ) + +/obj/machinery/computer/HolodeckControl/holodorm/one + name = "dorm one holodeck control" + projection_area = /area/crew_quarters/sleep/Dorm_1/holo + +/obj/machinery/computer/HolodeckControl/holodorm/three + name = "dorm three holodeck control" + projection_area = /area/crew_quarters/sleep/Dorm_3/holo + +/obj/machinery/computer/HolodeckControl/holodorm/five + name = "dorm five holodeck control" + projection_area = /area/crew_quarters/sleep/Dorm_5/holo + +/obj/machinery/computer/HolodeckControl/holodorm/seven + name = "dorm seven holodeck control" + projection_area = /area/crew_quarters/sleep/Dorm_7/holo + +//"Red" Armory Door +/obj/machinery/door/airlock/security/armory + name = "Red Armory" + //color = "" + +/obj/machinery/door/airlock/security/armory/allowed(mob/user) + if(get_security_level() in list("green","blue")) + return FALSE + + return ..(user) + +//Tether-unique network cameras +/obj/machinery/camera/network/tether + network = list(NETWORK_TETHER) + +/obj/machinery/camera/network/outside + network = list(NETWORK_OUTSIDE) + +/obj/tether_away_spawner/tether_outside + name = "Tether Outside Spawner" + prob_spawn = 75 + prob_fall = 50 + mobs_to_pick_from = list( + /mob/living/simple_mob/animal/passive/gaslamp = 300 + ) + +// Landmarks for wildlife events + +/obj/effect/landmark/wildlife/water + name = "aquatic wildlife" + wildlife_type = 1 + +/obj/effect/landmark/wildlife/forest + name = "roaming wildlife" + wildlife_type = 2 + +// SD Things + +/obj/machinery/camera/network/halls + network = list(NETWORK_HALLS) + +/obj/item/paper/sdshield + name = "ABOUT THE SHIELD GENERATOR" + info = "

ABOUT THE SHIELD GENERATOR



If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.

The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.

It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).

With only those two and all the other default settings, the shield uses more than 6 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.

The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for a few minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.

So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.

Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.

Good luck out there - Budly Gregington" + +/obj/item/book/manual/sd_guide + name = "Stellar Delight User's Guide" + icon = 'icons/obj/library.dmi' + icon_state ="newscodex" + item_state = "newscodex" + author = "Central Command" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Stellar Delight User's Guide" + +/obj/item/book/manual/sd_guide/New() + ..() + dat = {" + + + + + +

Stellar Delight Operations

+

+ Welcome to the Stellar Delight! Before you get started there are a few things you ought to know. +

+ The Stellar Delight is a Nanotrasen response vessel operating in the Virgo-Erigone system. It's primary duty is in answering calls for help, investigating anomalies in space around the system, and generally responding to requests from Central Command or whoever else needs the services the vessel can provide. It has fully functioning security, medical, and research facilities, as well as a host of civillian facilities, in addition to the standard things one might expect to find on such a ship. That is to say, the ship doesn't have a highly defined specialization, it is just as capable as a small space station might be. +

+ Notably though, there are some research facilities that are not safe to carry around. There is a refurbished Aerostat that has been set up over Virgo 2 that posesses a number of different, more dangerous research facilities. The command staff of this vessel has access to its docking codes in their offices. +

+ Mining and Exploration will probably also want to disembark to do their respective duties. +

+ The ship is ordinarily protected from many space hazards by an array of point defense turrets, however, it should be noted that this defense network is not infallible. If the ship encounters a dangerous environment, occasionally hazardous material may slip past the network and damage the ship. +


+

Before Moving the Ship

+

+ The ship requires power to fuel and run its engines and sensors. While there may be some charge in the ship at the start of the shift, it is HIGHLY RECOMMENDED that the engine be started before attempting to move the ship. If any of the components responsible for moving the ship lose power (including but not limited to the helm control console and the thrusters), then you will be incapable of adjusting the ship's speed or heading until the problem is resolved. +

+ Additionally, the shield generator should be configured before the ship moves, as it takes time to calibrate before it can be activated. The shield should not be run indefinitely however, as it uses more power than the ship ordinarily generates. You can however activate it for a short time if you know that you need to proceed through a dangerous reigon of space. For more information, see the configuration guide sheet in the shield control room on deck 3, aft of the Command Office section. +


+

Starting and Moving the Ship

+

+ The ship can of course move around on its own, but a few steps need to/should be taken before you can do so. +

+ -FIRST. You should appoint a pilot. If there isn't a pilot, or the pilot isn't responding, you should fax for a pilot. If no pilots respond to the fax within a reasonable timeframe, then, if you are qualified to fly Nanotrasen spacecraft you may fly the ship. Appointing a pilot to the bridge however should always be done even if you know how to fly and have access to the helm control console. Refusing to attempt to appoint a pilot and just flying the ship yourself can be grounds for demotion to pilot. +

+ -SECOND. In order for the ship to move one must start the engines. The ship's fuel pump in Atmospherics must be turned on and configured. Atmospheric technicians may elect to modify the fuel mix to help the ship go faster or make the fuel last longer. Either way, once the fuel pump is on, you may use the engine control console on the bridge to activate the engines. +

+ Once these steps have been taken, the helm control console should respond to input commands from the pilot. +


+

Disembarking

+

+ Being a response vessel, the Stellar Delight has 3 shuttles in total. +

+ The mining and exploration shuttles are located in the aft of deck 1 between their respective departments. Both of these shuttles are short jump shuttles, meaning, they are not suitable for more than ferrying people back and forth between the ship and the present destination. They do have a small range that they can traverse in their bluespace hops, but they must be within one 'grid square' of a suitable landing site to jump. As such, it is recommended that you avoid flying away from wherever either of these shuttles are without establishing a flight plan with the away teams to indicate a time of returning. In cases where the mining team and the exploration team want to go to different places, it may be necessary to fly from one location to the other now and then to facilitate both operations. However, it is recommended that exploration and mining be encouraged to enter the same operations areas, as the mining team is poorly armed, and the exploration team is ideally equipped for offsite defense and support of ship personnel. +

+ There is also the Starstuff, a long range capable shuttle which is ordinarily docked on the port landing pad of deck 3. This shuttle is meant for general crew transport, but does require a pilot to be flown. +

+ In cases where the shuttles will be docking with another facility, such as the Science outpost on the Virgo 2 Aerostat, docking codes may be required in order to be accessed. Anywhere requiring such codes will need to have them entered into the given shuttle's short jump console. It is recommended that anyone operating such a shuttle take note of the Stellar Delight's docking codes, as they will need them to dock with the ship. Any Nanotrasen owned facility that requires them that your ship has authorization to access will have the codes stored in the Command Offices. +

+ A final note on disembarking. While it may not necessarily be their job to do so, it is highly encouraged for the Command staff to attempt to involve volunteers in off ship operations as necessary. Just make sure to let let it be known what kind of operation is happening when you ask. This being a response ship, it is very good to get as much help to handle whatever the issue is as thoroughly as possible. +

+ All that said, have a safe trip. - Central Command Officer Alyssa Trems + + "} + +/obj/item/multitool/scioutpost + name = "science outpost linked multitool" + desc = "It has the data for the science outpost's quantum pad pre-loaded... assuming you didn't override it." + +/obj/item/multitool/scioutpost/Initialize(mapload) + . = ..() + for(var/obj/machinery/power/quantumpad/scioutpost/outpost in world) + connectable = outpost + if(connectable) + icon_state = "multitool_red" + return + +/obj/machinery/power/quantumpad/scioutpost + +//Special map objects +/obj/effect/landmark/map_data/virgo3b + height = 5 + +/obj/turbolift_map_holder/tether + name = "Tether Climber" + depth = 5 + lift_size_x = 3 + lift_size_y = 3 + icon = 'icons/obj/turbolift_preview_3x3.dmi' + wall_type = null // Don't make walls + + areas_to_use = list( + /area/turbolift/t_surface/level1, + /area/turbolift/t_surface/level2, + /area/turbolift/t_surface/level3, + /area/turbolift/tether/transit, + /area/turbolift/t_station/level1 + ) + +/obj/machinery/atmospherics/unary/vent_pump/positive + use_power = USE_POWER_IDLE + icon_state = "map_vent_out" + external_pressure_bound = ONE_ATMOSPHERE * 1.1 + +/obj/machinery/computer/shuttle_control/aerostat_shuttle + name = "aerostat ferry control console" + shuttle_tag = "Aerostat Ferry" + +/obj/tether_away_spawner/aerostat_inside + name = "Aerostat Indoors Spawner" + faction = FACTION_AEROSTAT_INSIDE + atmos_comp = TRUE + prob_spawn = 100 + prob_fall = 50 + //guard = 20 + mobs_to_pick_from = list( + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic = 3, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion = 1, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser = 3, + /mob/living/simple_mob/vore/aggressive/corrupthound = 1 + ) + +/obj/tether_away_spawner/aerostat_surface + name = "Aerostat Surface Spawner" + faction = FACTION_AEROSTAT_SURFACE + atmos_comp = TRUE + prob_spawn = 100 + prob_fall = 30 + //guard = 20 + mobs_to_pick_from = list( + /mob/living/simple_mob/vore/jelly = 6, + /mob/living/simple_mob/mechanical/viscerator = 6, + /mob/living/simple_mob/vore/aggressive/corrupthound = 3, + /mob/living/simple_mob/vore/oregrub = 2, + /mob/living/simple_mob/vore/oregrub/lava = 1 + ) + +/obj/structure/old_roboprinter + name = "old drone fabricator" + desc = "Built like a tank, still working after so many years." + icon = 'icons/obj/machines/drone_fab.dmi' + icon_state = "drone_fab_idle" + anchored = TRUE + density = TRUE + +/obj/structure/metal_edge + name = "metal underside" + desc = "A metal wall that extends downwards." + icon = 'icons/turf/cliff.dmi' + icon_state = "metal" + anchored = TRUE + density = FALSE diff --git a/maps/common/common_turfs.dm b/maps/common/common_turfs.dm new file mode 100644 index 0000000000..f6d28b2bce --- /dev/null +++ b/maps/common/common_turfs.dm @@ -0,0 +1,199 @@ +//Unsimulated + +/turf/unsimulated/mineral/virgo3b + blocks_air = TRUE + +/turf/unsimulated/floor/steel + icon = 'icons/turf/flooring/tiles_vr.dmi' + icon_state = "steel" + +// Some turfs to make floors look better in centcom tram station. + +/turf/unsimulated/floor/techfloor_grid + name = "floor" + icon = 'icons/turf/flooring/techfloor.dmi' + icon_state = "techfloor_grid" + +/turf/unsimulated/floor/maglev + name = "maglev track" + desc = "Magnetic levitation tram tracks. Caution! Electrified!" + icon = 'icons/turf/flooring/maglevs.dmi' + icon_state = "maglevup" + +/turf/unsimulated/wall/transit + icon = 'icons/turf/transit_vr.dmi' + +/turf/unsimulated/floor/transit + icon = 'icons/turf/transit_vr.dmi' + +/obj/effect/floor_decal/transit/orange + icon = 'icons/turf/transit_vr.dmi' + icon_state = "transit_techfloororange_edges" + +/obj/effect/transit/light + icon = 'icons/turf/transit_128.dmi' + icon_state = "tube1-2" + +VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/dirt) +/turf/simulated/floor/outdoors/dirt/virgo3b + icon = 'icons/turf/flooring/asteroid.dmi' + icon_state = "asteroid" + +VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/grass/sif) +/turf/simulated/floor/outdoors/grass/sif + turf_layers = list( + /turf/simulated/floor/outdoors/rocks/virgo3b, + /turf/simulated/floor/outdoors/dirt/virgo3b + ) + +VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) +VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/steel_dirty) +VIRGO3B_TURF_CREATE(/turf/simulated/floor/water/indoors) +VIRGO3B_TURF_CREATE(/turf/simulated/open) +VIRGO3B_TURF_CREATE(/turf/simulated/floor) +VIRGO3B_TURF_CREATE(/turf/simulated/mineral) +VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) +VIRGO3B_TURF_CREATE(/turf/simulated/floor/plating/external) +VIRGO3B_TURF_CREATE(/turf/simulated/floor/reinforced) + +// Bluespace jump turf! +/turf/space/bluespace + name = "bluespace" + icon = 'icons/turf/space_vr.dmi' + icon_state = "bluespace" + +// Desert jump turf! +/turf/space/sandyscroll + name = "sand transit" + icon = 'icons/turf/transit_vr.dmi' + icon_state = "desert_ns" + +//Sky stuff! +// A simple turf to fake the appearance of flying. +/turf/simulated/sky/virgo3b + color = "#FFBBBB" + +/turf/simulated/sky/virgo3b/Initialize(mapload) + SSplanets.addTurf(src) + set_light(2, 2, "#FFBBBB") + +/turf/simulated/sky/virgo3b/north + dir = NORTH +/turf/simulated/sky/virgo3b/south + dir = SOUTH +/turf/simulated/sky/virgo3b/east + dir = EAST +/turf/simulated/sky/virgo3b/west + dir = WEST + +/turf/simulated/sky/virgo3b/moving + icon_state = "sky_fast" +/turf/simulated/sky/virgo3b/moving/north + dir = NORTH +/turf/simulated/sky/virgo3b/moving/south + dir = SOUTH +/turf/simulated/sky/virgo3b/moving/east + dir = EAST +/turf/simulated/sky/virgo3b/moving/west + dir = WEST + +/turf/simulated/floor/midpoint_glass + name = "glass floor" + desc = "Dont jump on it, or do, I'm not your mom." + icon = 'icons/turf/flooring/glass.dmi' + icon_state = "glass-0" + base_icon_state = "glass" + +/turf/simulated/floor/midpoint_glass/reinf + name = "reinforced glass floor" + desc = "Do jump on it, it can take it." + icon = 'icons/turf/flooring/reinf_glass.dmi' + icon_state = "reinf_glass-0" + base_icon_state = "reinf_glass" + +/turf/simulated/floor/midpoint_glass/Initialize(mapload) + . = ..() + return INITIALIZE_HINT_LATELOAD + +/turf/simulated/floor/midpoint_glass/LateInitialize() + do_icons() + +/turf/simulated/floor/midpoint_glass/proc/do_icons() + var/new_junction = NONE + + for(var/direction in cardinal) //Cardinal case first. + var/turf/T = get_step(src, direction) + if(istype(T, type)) + new_junction |= direction + + if(!(new_junction & (NORTH|SOUTH)) || !(new_junction & (EAST|WEST))) + icon_state = "[base_icon_state]-[new_junction]" + return + + if(new_junction & NORTH) + if(new_junction & WEST) + var/turf/T = get_step(src, NORTHWEST) + if(istype(T, type)) + new_junction |= (1<<7) + + if(new_junction & EAST) + var/turf/T = get_step(src, NORTHEAST) + if(istype(T, type)) + new_junction |= (1<<4) + + if(new_junction & SOUTH) + if(new_junction & WEST) + var/turf/T = get_step(src, SOUTHWEST) + if(istype(T, type)) + new_junction |= (1<<6) + + if(new_junction & EAST) + var/turf/T = get_step(src, SOUTHEAST) + if(istype(T, type)) + new_junction |= (1<<5) + + icon_state = "[base_icon_state]-[new_junction]" + + add_vis_overlay('icons/effects/effects.dmi', "white", plane = SPACE_PLANE, add_vis_flags = VIS_INHERIT_ID|VIS_UNDERLAY) + +/turf/space/v3b_midpoint + +// Tram transit floor +/turf/simulated/floor/tiled/techfloor/grid/transit + icon = 'icons/turf/transit_vr.dmi' + initial_flooring = null + +/turf/unsimulated/floor/sky/virgo2_sky + name = "virgo 2 atmosphere" + desc = "Be careful where you step!" + color = "#eacd7c" + VIRGO2_SET_ATMOS + +/turf/simulated/shuttle/wall/voidcraft/green/virgo2 + VIRGO2_SET_ATMOS + color = "#eacd7c" + +/turf/simulated/shuttle/wall/voidcraft/green/virgo2/nocol + color = null + +VIRGO2_TURF_CREATE(/turf/unsimulated/wall/planetary) + +VIRGO2_TURF_CREATE(/turf/simulated/wall) +VIRGO2_TURF_CREATE(/turf/simulated/floor/plating) +VIRGO2_TURF_CREATE(/turf/simulated/floor/bluegrid) +VIRGO2_TURF_CREATE(/turf/simulated/floor/tiled/techfloor) + +VIRGO2_TURF_CREATE(/turf/simulated/mineral) + +VIRGO2_TURF_CREATE(/turf/simulated/mineral/ignore_mapgen) +VIRGO2_TURF_CREATE(/turf/simulated/mineral/floor) +VIRGO2_TURF_CREATE(/turf/simulated/mineral/floor/ignore_mapgen) + +VIRGO2_TURF_CREATE(/turf/simulated/floor/hull) + +/turf/simulated/mineral/vacuum/gb_mine + +/turf/simulated/floor/virgo3b_indoors + VIRGO3B_SET_ATMOS +/turf/simulated/floor/virgo3b_indoors/update_graphic(list/graphic_add = null, list/graphic_remove = null) + return 0 diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index e9d209fba9..1368416f8c 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -192,7 +192,7 @@ color = "#eacd7c" VIRGO2_SET_ATMOS -/turf/unsimulated/floor/sky/virgo2_sky/Initialize() +/turf/unsimulated/floor/sky/virgo2_sky/Initialize(mapload) skyfall_levels = list(z+1) . = ..() diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm index 37805dfa7f..7e959a7c13 100644 --- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm +++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm @@ -20,7 +20,7 @@ skybox_pixel_x = 0 skybox_pixel_y = 0 -/obj/effect/overmap/visitable/sector/virgo2/Initialize() +/obj/effect/overmap/visitable/sector/virgo2/Initialize(mapload) for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in world) docking_codes = sd.docking_codes . = ..() @@ -125,7 +125,7 @@ color = "#eacd7c" VIRGO2_SET_ATMOS -/turf/unsimulated/floor/sky/virgo2_sky/Initialize() +/turf/unsimulated/floor/sky/virgo2_sky/Initialize(mapload) skyfall_levels = list(z+1) . = ..() diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm index cbd0b271b2..b405ea5e08 100644 --- a/maps/expedition_vr/alienship/_alienship.dm +++ b/maps/expedition_vr/alienship/_alienship.dm @@ -114,7 +114,7 @@ var/area/dump_area var/obj/shuttle_connector/shuttle_friend -/area/shuttle/excursion/away_alienship/Initialize() +/area/shuttle/excursion/away_alienship/Initialize(mapload) . = ..() dump_area = locate(/area/tether_away/alienship/equip_dump) diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index adcf7c3ca4..8d1e1bf20b 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -61,7 +61,7 @@ name = "away mission initializer - beachcave" //In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself -/obj/away_mission_init/beachcave/Initialize() +/obj/away_mission_init/beachcave/Initialize(mapload) // Cave submaps are first. /*seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal) seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep) @@ -119,14 +119,14 @@ // These are step-teleporters, for map edge transitions // This top one goes INTO the cave -/obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize() +/obj/effect/step_trigger/teleporter/away_beach_tocave/Initialize(mapload) . = ..() teleport_x = src.x //X is horizontal. This is a top of map transition, so you want the same horizontal alignment in the cave as you have on the beach teleport_y = 2 //2 is because it's putting you on row 2 of the map to the north teleport_z = z+1 //The cave is always our Z-level plus 1, because it's loaded after us //This one goes OUT OF the cave -/obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize() +/obj/effect/step_trigger/teleporter/away_beach_tobeach/Initialize(mapload) . = ..() teleport_x = src.x //Same reason as bove teleport_y = world.maxy - 1 //This means "1 space from the top of the map" @@ -139,7 +139,7 @@ name = "Water" icon_state = "water" -/turf/simulated/floor/beach/coastwater/Initialize() +/turf/simulated/floor/beach/coastwater/Initialize(mapload) . = ..() add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water","layer"=MOB_LAYER+0.1)) diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index 9582426fa8..73983004cc 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -44,7 +44,7 @@ /obj/away_mission_init/debrisfield name = "away mission initializer - debrisfield" -/obj/away_mission_init/debrisfield/Initialize() +/obj/away_mission_init/debrisfield/Initialize(mapload) flags |= ATOM_INITIALIZED return INITIALIZE_HINT_QDEL @@ -103,7 +103,7 @@ has_gravity = FALSE -/area/submap/debrisfield/phoron_tanker/Initialize() +/area/submap/debrisfield/phoron_tanker/Initialize(mapload) . = ..() var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/tsc/nanotrasen] ic_name = pick(O.ship_names) @@ -153,7 +153,7 @@ landmark_tag = "debris_field_yacht_start" shuttle_type = /datum/shuttle/autodock/overmap/luxury_boat -/obj/effect/shuttle_landmark/shuttle_initializer/luxury_boat/Initialize() +/obj/effect/shuttle_landmark/shuttle_initializer/luxury_boat/Initialize(mapload) var/obj/effect/overmap/visitable/O = get_overmap_sector(get_z(src)) //make this into general system some other time LAZYINITLIST(O.initial_restricted_waypoints) O.initial_restricted_waypoints["Luxury Yacht"] = list(landmark_tag) @@ -166,7 +166,7 @@ vessel_size = SHIP_SIZE_SMALL shuttle = "Luxury Yacht" -/obj/effect/overmap/visitable/ship/landable/luxury_boat/Initialize() +/obj/effect/overmap/visitable/ship/landable/luxury_boat/Initialize(mapload) . = ..() var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/gov/elysia] var/newname = "ECS-T [pick(O.ship_names)]" @@ -244,7 +244,7 @@ landmark_tag = "debris_field_carrier_start" shuttle_type = /datum/shuttle/autodock/overmap/tinycarrier -/obj/effect/shuttle_landmark/shuttle_initializer/tinycarrier/Initialize() +/obj/effect/shuttle_landmark/shuttle_initializer/tinycarrier/Initialize(mapload) var/obj/effect/overmap/visitable/O = get_overmap_sector(get_z(src)) //make this into general system some other time LAZYINITLIST(O.initial_restricted_waypoints) O.initial_restricted_waypoints["Debris Carrier"] = list(landmark_tag) @@ -257,7 +257,7 @@ vessel_size = SHIP_SIZE_SMALL shuttle = "Debris Carrier" -/obj/effect/overmap/visitable/ship/landable/tinycarrier/Initialize() +/obj/effect/overmap/visitable/ship/landable/tinycarrier/Initialize(mapload) . = ..() var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/other/sysdef] var/newname = "SDV [pick(O.ship_names)]" @@ -292,7 +292,7 @@ /obj/mecha/combat/fighter/baron/busted starting_components = list(/obj/item/mecha_parts/component/hull/lightweight,/obj/item/mecha_parts/component/actuator/hispeed,/obj/item/mecha_parts/component/armor,/obj/item/mecha_parts/component/gas,/obj/item/mecha_parts/component/electrical/high_current) -/obj/mecha/combat/fighter/baron/busted/Initialize() +/obj/mecha/combat/fighter/baron/busted/Initialize(mapload) . = ..() health = round(rand(50,120)) cell?.charge = 0 @@ -304,7 +304,7 @@ setInternalDamage(MECHA_INT_SHORT_CIRCUIT) -/obj/structure/fuel_port/empty_tank/Initialize() +/obj/structure/fuel_port/empty_tank/Initialize(mapload) . = ..() var/obj/item/tank/phoron/T = locate() in src if(T) diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index 7e77d02d1f..93ba890186 100644 --- a/maps/groundbase/groundbase_telecomms.dm +++ b/maps/groundbase/groundbase_telecomms.dm @@ -80,7 +80,7 @@ name = "pre-linked multitool (Rascal's Pass hub)" desc = "This multitool has already been linked to the groundbase telecomms hub and can be used to configure one (1) relay." -/obj/item/multitool/station_buffered/Initialize() +/obj/item/multitool/station_buffered/Initialize(mapload) . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/groundbase) diff --git a/maps/groundbase/groundbase_things.dm b/maps/groundbase/groundbase_things.dm index 0530007d71..c9dbb57f30 100644 --- a/maps/groundbase/groundbase_things.dm +++ b/maps/groundbase/groundbase_things.dm @@ -4,7 +4,8 @@ invisibility = 0 plane = TURF_PLANE layer = ABOVE_TURF_LAYER -/obj/effect/step_trigger/teleporter/to_mining/Initialize() + +/obj/effect/step_trigger/teleporter/to_mining/Initialize(mapload) . = ..() teleport_x = x teleport_y = y ++ @@ -17,7 +18,7 @@ plane = TURF_PLANE layer = ABOVE_TURF_LAYER -/obj/effect/step_trigger/teleporter/from_mining/Initialize() +/obj/effect/step_trigger/teleporter/from_mining/Initialize(mapload) . = ..() teleport_x = x teleport_y = y -- @@ -80,7 +81,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) var/area/shock_area = /area/centcom/terminal/tramfluff -/turf/simulated/floor/maglev/Initialize() +/turf/simulated/floor/maglev/Initialize(mapload) . = ..() shock_area = locate(shock_area) @@ -111,4 +112,4 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) /obj/effect/landmark/wildlife/forest name = "roaming wildlife" - wildlife_type = 2 \ No newline at end of file + wildlife_type = 2 diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm index e1f032a79c..524e22db18 100644 --- a/maps/offmap_vr/common_offmaps.dm +++ b/maps/offmap_vr/common_offmaps.dm @@ -420,7 +420,7 @@ /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each affect_ghosts = 1 -/obj/effect/step_trigger/zlevel_fall/Initialize() +/obj/effect/step_trigger/zlevel_fall/Initialize(mapload) . = ..() if(istype(get_turf(src), /turf/simulated/floor)) @@ -483,7 +483,7 @@ var/mob/living/simple_mob/my_mob var/depleted = FALSE -/obj/tether_away_spawner/Initialize() +/obj/tether_away_spawner/Initialize(mapload) . = ..() if(!LAZYLEN(mobs_to_pick_from)) diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 73db3be473..2cb7ff110e 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -280,7 +280,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you item_state = "tdgreen" assignment = "Talon synthetic" -/obj/item/card/id/synthetic/talon/Initialize() +/obj/item/card/id/synthetic/talon/Initialize(mapload) . = ..() access = list(access_talon, access_synth) diff --git a/maps/redgate/falls/atoll_decals.dm b/maps/redgate/falls/atoll_decals.dm index f89939df3e..a56e6efe10 100644 --- a/maps/redgate/falls/atoll_decals.dm +++ b/maps/redgate/falls/atoll_decals.dm @@ -22,7 +22,7 @@ name = "marble stairs" icon_state = "stairs" -/obj/effect/floor_decal/atoll/stairs/Initialize() +/obj/effect/floor_decal/atoll/stairs/Initialize(mapload) dir = pick(cardinal) . = ..() @@ -30,7 +30,7 @@ name = "moss" icon_state = "moss" -/obj/effect/floor_decal/atoll/moss/random/Initialize() +/obj/effect/floor_decal/atoll/moss/random/Initialize(mapload) dir = pick(alldirs) . = ..() @@ -62,7 +62,7 @@ anchored = 1 mouse_opacity = 0 -/obj/effect/decal/whitecaps/Initialize() +/obj/effect/decal/whitecaps/Initialize(mapload) icon_state = pick("1","2","3") . = ..() diff --git a/maps/redgate/falls/atoll_objs.dm b/maps/redgate/falls/atoll_objs.dm index ac24d846d5..4bc820f017 100644 --- a/maps/redgate/falls/atoll_objs.dm +++ b/maps/redgate/falls/atoll_objs.dm @@ -79,7 +79,7 @@ layer = MOB_LAYER + 0.2 plane = MOB_PLANE -/obj/structure/canopy/Initialize() +/obj/structure/canopy/Initialize(mapload) . = ..() dir = pick(alldirs) @@ -93,14 +93,14 @@ /obj/structure/canopy/edge/north icon_state = "north" -/obj/structure/canopy/edge/north/Initialize() +/obj/structure/canopy/edge/north/Initialize(mapload) . = ..() dir = pick(1,2) //i cba to add two more /obj/structure/canopy/edge/south icon_state = "south" -/obj/structure/canopy/edge/south/Initialize() +/obj/structure/canopy/edge/south/Initialize(mapload) . = ..() dir = pick(cardinal) @@ -266,6 +266,6 @@ //teleport_z must be populated but this is a gateway map //switching between tether or another map will change the z //so we just do this lmfao -/obj/effect/step_trigger/teleporter/atoll/Initialize() +/obj/effect/step_trigger/teleporter/atoll/Initialize(mapload) . = ..() teleport_z = z diff --git a/maps/redgate/falls/atoll_turfs.dm b/maps/redgate/falls/atoll_turfs.dm index cf412a782f..3a01324b04 100644 --- a/maps/redgate/falls/atoll_turfs.dm +++ b/maps/redgate/falls/atoll_turfs.dm @@ -7,7 +7,7 @@ dynamic_lighting = 0 //Pick random sprite states and generate damage decals randomly -/turf/simulated/floor/atoll/Initialize() +/turf/simulated/floor/atoll/Initialize(mapload) . = ..() icon_state = "[rand(1,5)]" if(prob(5)) @@ -20,7 +20,7 @@ icon_state = "wall" density = 1 -/turf/simulated/floor/atoll/vertical/Initialize() +/turf/simulated/floor/atoll/vertical/Initialize(mapload) . = ..() icon_state = "wall" @@ -41,7 +41,7 @@ add_overlay(water_sprite) //Spawn animated whitecaps around -/turf/simulated/floor/water/atoll/Initialize() +/turf/simulated/floor/water/atoll/Initialize(mapload) . = ..() if(prob(25)) new /obj/effect/decal/whitecaps(src) @@ -55,4 +55,4 @@ ..() cut_overlays() var/image/water_sprite = image(icon = 'maps/redgate/falls/icons/turfs/water.dmi', icon_state = "sunken", layer = 3.0) - add_overlay(water_sprite) \ No newline at end of file + add_overlay(water_sprite) diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm index 871b5133ba..2255e715cb 100644 --- a/maps/redgate/fantasy_items.dm +++ b/maps/redgate/fantasy_items.dm @@ -179,7 +179,7 @@ to_chat(user, "You carefully place \the [I] into the cistern.") return -/obj/structure/toilet/wooden/Initialize() +/obj/structure/toilet/wooden/Initialize(mapload) open = 1 //just to make sure it works icon_state = "toilet3" . = ..() diff --git a/maps/stellar_delight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm index 4d72693fb6..0c6e6ff3b2 100644 --- a/maps/stellar_delight/stellar_delight_defines.dm +++ b/maps/stellar_delight/stellar_delight_defines.dm @@ -384,3 +384,49 @@ desc = "The Virgo 2 Aerostat away mission." mappath = "maps/expedition_vr/aerostat/aerostat_science_outpost.dmm" associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat + +/////FOR CENTCOMM (at least)///// +/obj/effect/overmap/visitable/sector/virgo3b + known = TRUE + in_space = TRUE + + initial_generic_waypoints = list("sr-c","sr-n","sr-s") + initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad")) + + extra_z_levels = list(Z_LEVEL_SPACE_ROCKS) + +/////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards) +/obj/effect/overmap/visitable/sector/virgo3b/Initialize(mapload) + . = ..() + for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in world) + sd.forceMove(loc, SOUTH) + return + +/obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM) + . = ..() + announce_atc(AM,going = FALSE) + +/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(var/atom/movable/AM) + . = ..() + announce_atc(AM,going = TRUE) + +/obj/effect/overmap/visitable/sector/virgo3b/proc/announce_atc(var/atom/movable/AM, var/going = FALSE) + if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob)) + if(world.time < mob_announce_cooldown) + return + else + mob_announce_cooldown = world.time + 5 MINUTES + var/message = "Sensor contact for vessel '[AM.name]' has [going ? "left" : "entered"] ATC control area." + //For landables, we need to see if their shuttle is cloaked + if(istype(AM, /obj/effect/overmap/visitable/ship/landable)) + var/obj/effect/overmap/visitable/ship/landable/SL = AM //Phew + var/datum/shuttle/autodock/multi/shuttle = SSshuttles.shuttles[SL.shuttle] + if(!istype(shuttle) || !shuttle.cloaked) //Not a multishuttle (the only kind that can cloak) or not cloaked + atc.msg(message) + + //For ships, it's safe to assume they're big enough to not be sneaky + else if(istype(AM, /obj/effect/overmap/visitable/ship)) + atc.msg(message) + +/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() + return list(Z_LEVEL_SPACE_ROCKS) diff --git a/maps/stellar_delight/stellar_delight_shuttle_defs.dm b/maps/stellar_delight/stellar_delight_shuttle_defs.dm index cbdf35b4f6..7d1812add2 100644 --- a/maps/stellar_delight/stellar_delight_shuttle_defs.dm +++ b/maps/stellar_delight/stellar_delight_shuttle_defs.dm @@ -259,7 +259,7 @@ var/mob_announce_cooldown = 0 /////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards) -/obj/effect/overmap/visitable/sector/virgo3b/Initialize() +/obj/effect/overmap/visitable/sector/virgo3b/Initialize(mapload) . = ..() for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in world) sd.forceMove(loc, SOUTH) diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm index c9a73c6208..ddf89dcd43 100644 --- a/maps/stellar_delight/stellar_delight_telecomms.dm +++ b/maps/stellar_delight/stellar_delight_telecomms.dm @@ -85,7 +85,7 @@ name = "pre-linked multitool (sd hub)" desc = "This multitool has already been linked to the SD telecomms hub and can be used to configure one (1) relay." -/obj/item/multitool/station_buffered/Initialize() +/obj/item/multitool/station_buffered/Initialize(mapload) . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/sd) diff --git a/maps/stellar_delight/stellar_delight_things.dm b/maps/stellar_delight/stellar_delight_things.dm index d1fcaa2185..a0a7871c83 100644 --- a/maps/stellar_delight/stellar_delight_things.dm +++ b/maps/stellar_delight/stellar_delight_things.dm @@ -14,7 +14,7 @@ var/area/shock_area = /area/tether/surfacebase/tram -/turf/simulated/floor/maglev/Initialize() +/turf/simulated/floor/maglev/Initialize(mapload) . = ..() shock_area = locate(shock_area) @@ -165,7 +165,7 @@ name = "science outpost linked multitool" desc = "It has the data for the science outpost's quantum pad pre-loaded... assuming you didn't override it." -/obj/item/multitool/scioutpost/Initialize() +/obj/item/multitool/scioutpost/Initialize(mapload) . = ..() for(var/obj/machinery/power/quantumpad/scioutpost/outpost in world) connectable = outpost @@ -177,4 +177,4 @@ /datum/random_map/noise/ore/virgo2 // Less OP generation map, but better than Underdark deep_val = 0.7 - rare_val = 0.5 \ No newline at end of file + rare_val = 0.5 diff --git a/maps/submaps/_helpers.dm b/maps/submaps/_helpers.dm index a7e21c270a..89ed334e05 100644 --- a/maps/submaps/_helpers.dm +++ b/maps/submaps/_helpers.dm @@ -6,7 +6,7 @@ density = 1 blocks_air = TRUE -/turf/space/internal_edge/Initialize() +/turf/space/internal_edge/Initialize(mapload) . = ..() opacity = 1 // This will get reset due to using appearances that are precreated in SSskybox, and apps have opacity = 0 density = 1 diff --git a/maps/submaps/admin_use_vr/event_autonomous_drone.dm b/maps/submaps/admin_use_vr/event_autonomous_drone.dm index aad643108b..860f2a468b 100644 --- a/maps/submaps/admin_use_vr/event_autonomous_drone.dm +++ b/maps/submaps/admin_use_vr/event_autonomous_drone.dm @@ -27,7 +27,7 @@ landmark_tag = "omship_event_autonomous_drone" shuttle_type = /datum/shuttle/autodock/overmap/event_autonomous_drone -/obj/effect/shuttle_landmark/shuttle_initializer/event_autonomous_drone/Initialize() +/obj/effect/shuttle_landmark/shuttle_initializer/event_autonomous_drone/Initialize(mapload) var/obj/effect/overmap/visitable/O = get_overmap_sector(get_z(src)) //make this into general system some other time LAZYINITLIST(O.initial_restricted_waypoints) O.initial_restricted_waypoints["Autonomous Cargo Drone"] = list(landmark_tag) @@ -40,7 +40,7 @@ vessel_size = SHIP_SIZE_SMALL shuttle = "Autonomous Cargo Drone" -/obj/effect/overmap/visitable/ship/landable/event_autonomous_drone/Initialize() +/obj/effect/overmap/visitable/ship/landable/event_autonomous_drone/Initialize(mapload) . = ..() var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/tsc/nanotrasen] var/newname = "NTV [pick(O.ship_names)]" diff --git a/maps/submaps/admin_use_vr/fun.dm b/maps/submaps/admin_use_vr/fun.dm index 5d5d09c4ba..0a19fa5422 100644 --- a/maps/submaps/admin_use_vr/fun.dm +++ b/maps/submaps/admin_use_vr/fun.dm @@ -215,7 +215,7 @@ known = FALSE // It notifies admins when you spawn it and gives you a 'JMP' and 'VV' link in the message so you can find it easily. -/obj/effect/overmap/visitable/admin_use/Initialize() +/obj/effect/overmap/visitable/admin_use/Initialize(mapload) . = ..() message_admins("An uploaded sector [ADMIN_JMP(src)][ADMIN_VV(src)] has been placed on the overmap. Don't forget to rename and set cool scanner info on it!") @@ -274,7 +274,7 @@ known = FALSE // Similarly notifies you -/obj/effect/overmap/visitable/ship/admin_use/Initialize() +/obj/effect/overmap/visitable/ship/admin_use/Initialize(mapload) . = ..() message_admins("An uploaded ship [ADMIN_JMP(src)][ADMIN_VV(src)] has been placed on the overmap. Don't forget to rename and set cool scanner info on it!") diff --git a/maps/submaps/admin_use_vr/guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm index e83532c429..3d7f253d2e 100644 --- a/maps/submaps/admin_use_vr/guttersite.dm +++ b/maps/submaps/admin_use_vr/guttersite.dm @@ -26,7 +26,7 @@ /obj/away_mission_init/guttersite name = "away mission initializer - guttersite" -/obj/away_mission_init/guttersite/Initialize() +/obj/away_mission_init/guttersite/Initialize(mapload) initialized = TRUE return INITIALIZE_HINT_QDEL diff --git a/maps/submaps/engine_submaps/engine.dm b/maps/submaps/engine_submaps/engine.dm index faf12a7a86..9daea64a29 100644 --- a/maps/submaps/engine_submaps/engine.dm +++ b/maps/submaps/engine_submaps/engine.dm @@ -6,7 +6,7 @@ /obj/effect/landmark/engine_loader/New() INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader) -/obj/effect/landmark/engine_loader/Initialize() +/obj/effect/landmark/engine_loader/Initialize(mapload) if(SSmapping.engine_loader) warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]") delete_me = TRUE diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index b2f28282a3..abfc98b43c 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -167,7 +167,7 @@ /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each affect_ghosts = 1 -/obj/effect/step_trigger/zlevel_fall/Initialize() +/obj/effect/step_trigger/zlevel_fall/Initialize(mapload) . = ..() if(istype(get_turf(src), /turf/simulated/floor)) diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index d4d5eb6ad2..012c182762 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -102,7 +102,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/shuttle/floor/voidcraft) VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/kafel_full/yellow) //Mechbay -/obj/mecha/working/ripley/abandoned/Initialize() +/obj/mecha/working/ripley/abandoned/Initialize(mapload) . = ..() for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents) //Deletes the beacon so it can't be found easily qdel(B) diff --git a/maps/tether/tether_phoronlock.dm b/maps/tether/tether_phoronlock.dm index f474524c1a..7b7ce6a321 100644 --- a/maps/tether/tether_phoronlock.dm +++ b/maps/tether/tether_phoronlock.dm @@ -50,7 +50,7 @@ var/frequency = 0 var/datum/radio_frequency/radio_connection -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize() +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) @@ -119,7 +119,7 @@ /obj/machinery/embedded_controller/radio/airlock/phoron var/tag_scrubber -/obj/machinery/embedded_controller/radio/airlock/phoron/Initialize() +/obj/machinery/embedded_controller/radio/airlock/phoron/Initialize(mapload) . = ..() program = new/datum/embedded_program/airlock/phoron(src) diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index cf4b2622f2..e6820e036c 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -85,6 +85,6 @@ name = "pre-linked multitool (tether hub)" desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay." -/obj/item/multitool/station_buffered/Initialize() +/obj/item/multitool/station_buffered/Initialize(mapload) . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/tether) diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index e062152d1c..fc279cda73 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -27,31 +27,31 @@ external_pressure_bound = ONE_ATMOSPHERE * 1.1 -/obj/effect/step_trigger/teleporter/to_mining/Initialize() +/obj/effect/step_trigger/teleporter/to_mining/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = 2 teleport_z = Z_LEVEL_SURFACE_MINE -/obj/effect/step_trigger/teleporter/from_mining/Initialize() +/obj/effect/step_trigger/teleporter/from_mining/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = world.maxy - 1 teleport_z = Z_LEVEL_SURFACE_LOW -/obj/effect/step_trigger/teleporter/to_solars/Initialize() +/obj/effect/step_trigger/teleporter/to_solars/Initialize(mapload) . = ..() teleport_x = world.maxx - 1 teleport_y = src.y teleport_z = Z_LEVEL_SOLARS -/obj/effect/step_trigger/teleporter/from_solars/Initialize() +/obj/effect/step_trigger/teleporter/from_solars/Initialize(mapload) . = ..() teleport_x = 2 teleport_y = src.y teleport_z = Z_LEVEL_SURFACE_LOW -/obj/effect/step_trigger/teleporter/wild/Initialize() +/obj/effect/step_trigger/teleporter/wild/Initialize(mapload) . = ..() //If starting on east/west edges. @@ -73,7 +73,8 @@ icon = 'icons/obj/structures/stairs_64x64.dmi' icon_state = "" invisibility = 0 -/obj/effect/step_trigger/teleporter/to_underdark/Initialize() + +/obj/effect/step_trigger/teleporter/to_underdark/Initialize(mapload) . = ..() teleport_x = x teleport_y = y @@ -86,7 +87,8 @@ icon = 'icons/obj/structures/stairs_64x64.dmi' icon_state = "" invisibility = 0 -/obj/effect/step_trigger/teleporter/from_underdark/Initialize() + +/obj/effect/step_trigger/teleporter/from_underdark/Initialize(mapload) . = ..() teleport_x = x teleport_y = y @@ -95,13 +97,13 @@ if(Z.name == "Mining Outpost") teleport_z = Z.z -/obj/effect/step_trigger/teleporter/to_plains/Initialize() +/obj/effect/step_trigger/teleporter/to_plains/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = world.maxy - 1 teleport_z = Z_LEVEL_PLAINS -/obj/effect/step_trigger/teleporter/from_plains/Initialize() +/obj/effect/step_trigger/teleporter/from_plains/Initialize(mapload) . = ..() teleport_x = src.x teleport_y = 2 @@ -149,7 +151,7 @@ var/area/shock_area = /area/tether/surfacebase/tram -/turf/simulated/floor/maglev/Initialize() +/turf/simulated/floor/maglev/Initialize(mapload) . = ..() shock_area = locate(shock_area) diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index 8b6d676349..d8a3bd4319 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -168,7 +168,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" -/turf/space/bluespace/Initialize() +/turf/space/bluespace/Initialize(mapload) . = ..() icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" @@ -179,7 +179,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) icon = 'icons/turf/transit_vr.dmi' icon_state = "desert_ns" -/turf/space/sandyscroll/Initialize() +/turf/space/sandyscroll/Initialize(mapload) . = ..() icon_state = "desert_ns" @@ -188,7 +188,8 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) /turf/simulated/sky/virgo3b color = "#FFBBBB" -/turf/simulated/sky/virgo3b/Initialize() +/turf/simulated/sky/virgo3b/Initialize(mapload) + . = ..() SSplanets.addTurf(src) set_light(2, 2, "#FFBBBB") @@ -226,7 +227,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) icon_state = "reinf_glass-0" base_icon_state = "reinf_glass" -/turf/simulated/floor/midpoint_glass/Initialize() +/turf/simulated/floor/midpoint_glass/Initialize(mapload) . = ..() return INITIALIZE_HINT_LATELOAD @@ -271,7 +272,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) add_vis_overlay('icons/effects/effects.dmi', "white", plane = SPACE_PLANE, add_vis_flags = VIS_INHERIT_ID|VIS_UNDERLAY) -/turf/space/v3b_midpoint/Initialize() +/turf/space/v3b_midpoint/Initialize(mapload) . = ..() new /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b(src) diff --git a/maps/tether_better/tether_things.dm b/maps/tether_better/tether_things.dm index 6ea91f72a4..db0e6f17d9 100644 --- a/maps/tether_better/tether_things.dm +++ b/maps/tether_better/tether_things.dm @@ -75,7 +75,8 @@ icon = 'icons/obj/structures/stairs_64x64.dmi' icon_state = "" invisibility = 0 -/obj/effect/step_trigger/teleporter/to_underdark/Initialize() + +/obj/effect/step_trigger/teleporter/to_underdark/Initialize(mapload) . = ..() teleport_x = x teleport_y = y @@ -88,7 +89,8 @@ icon = 'icons/obj/structures/stairs_64x64.dmi' icon_state = "" invisibility = 0 -/obj/effect/step_trigger/teleporter/from_underdark/Initialize() + +/obj/effect/step_trigger/teleporter/from_underdark/Initialize(mapload) . = ..() teleport_x = x teleport_y = y @@ -166,7 +168,7 @@ var/area/shock_area = /area/tether/surfacebase/tram -/turf/simulated/floor/maglev/Initialize() +/turf/simulated/floor/maglev/Initialize(mapload) . = ..() shock_area = locate(shock_area) @@ -206,7 +208,7 @@ /obj/machinery/smartfridge/chemistry/chemvator/down name = "\improper Smart Chemavator - Lower" -/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize() +/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize(mapload) . = ..() var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) if(istype(above)) diff --git a/maps/yw/cryogaia_telecomms.dm b/maps/yw/cryogaia_telecomms.dm index ac0351d291..f7f247ba55 100644 --- a/maps/yw/cryogaia_telecomms.dm +++ b/maps/yw/cryogaia_telecomms.dm @@ -38,7 +38,7 @@ /obj/machinery/telecomms/broadcaster/preset_right/cryogaia id = "cryogaia_tx" - + /obj/machinery/telecomms/bus/preset_two/cryogaia freq_listening = list(SUP_FREQ, SRV_FREQ, EXP_FREQ) @@ -70,6 +70,6 @@ name = "pre-linked multitool (tether hub)" desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay." -/obj/item/multitool/cryogaia_buffered/Initialize() +/obj/item/multitool/cryogaia_buffered/Initialize(mapload) . = ..() - buffer = locate(/obj/machinery/telecomms/hub/preset/cryogaia) \ No newline at end of file + buffer = locate(/obj/machinery/telecomms/hub/preset/cryogaia) diff --git a/maps/yw/cryogaia_things.dm b/maps/yw/cryogaia_things.dm index 1231592db9..f0c7e253dd 100644 --- a/maps/yw/cryogaia_things.dm +++ b/maps/yw/cryogaia_things.dm @@ -82,7 +82,7 @@ var/area/shock_area = /area/cryogaia/tram -/turf/simulated/floor/maglev/Initialize() +/turf/simulated/floor/maglev/Initialize(mapload) . = ..() shock_area = locate(shock_area) @@ -122,7 +122,7 @@ /obj/machinery/smartfridge/chemistry/chemvator/down name = "\improper Smart Chemavator - Lower" -/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize() +/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize(mapload) . = ..() var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) if(istype(above)) @@ -145,7 +145,7 @@ /obj/machinery/smartfridge/plantvator/down name = "\improper Smart Plantavator - Lower" -/obj/machinery/smartfridge/plantvator/down/Initialize() +/obj/machinery/smartfridge/plantvator/down/Initialize(mapload) . = ..() var/obj/machinery/smartfridge/plantvator/above = locate(/obj/machinery/smartfridge/plantvator,get_zstep(src,UP)) if(istype(above)) @@ -620,7 +620,7 @@ var/global/list/latejoin_tram = list() anchored = TRUE catalogue_data = list(/datum/category_item/catalogue/material/trail_blazer) -obj/machinery/trailblazer/Initialize() +obj/machinery/trailblazer/Initialize(mapload) randomize_color() return ..() diff --git a/maps/yw/cryogaia_turfs.dm b/maps/yw/cryogaia_turfs.dm index 19b23690ac..6181082aec 100644 --- a/maps/yw/cryogaia_turfs.dm +++ b/maps/yw/cryogaia_turfs.dm @@ -194,8 +194,9 @@ CRYOGAIA_TURF_CREATE(/turf/simulated/mineral/floor) name = "bluespace" icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" -/turf/space/bluespace/Initialize() - ..() + +/turf/space/bluespace/Initialize(mapload) + . = ..() icon = 'icons/turf/space_vr.dmi' icon_state = "bluespace" @@ -213,7 +214,8 @@ CRYOGAIA_TURF_CREATE(/turf/simulated/mineral/floor) /turf/simulated/sky/borealis2 color = "#E0FFFF" -/turf/simulated/sky/borealis2/Initialize() +/turf/simulated/sky/borealis2/Initialize(mapload) + . = ..() SSplanets.addTurf(src) set_light(2, 2, "#E0FFFF") @@ -243,6 +245,7 @@ CRYOGAIA_TURF_CREATE(/turf/simulated/mineral/floor) icon_state = "snow_ns" -/turf/simulated/sky/snowscroll/Initialize() +/turf/simulated/sky/snowscroll/Initialize(mapload) + . = ..() SSplanets.addTurf(src) set_light(2, 2, "#E0FFFF") diff --git a/maps/yw/structures/closets/engineering.dm b/maps/yw/structures/closets/engineering.dm index 7ade91c524..5a8a57f213 100644 --- a/maps/yw/structures/closets/engineering.dm +++ b/maps/yw/structures/closets/engineering.dm @@ -22,7 +22,7 @@ /obj/item/taperoll/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering) -/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize() +/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else diff --git a/maps/yw/structures/closets/medical.dm b/maps/yw/structures/closets/medical.dm index c386cbf956..f8f07026ac 100644 --- a/maps/yw/structures/closets/medical.dm +++ b/maps/yw/structures/closets/medical.dm @@ -20,7 +20,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/shoes/white) -/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize() +/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/medic else diff --git a/maps/yw/structures/closets/misc.dm b/maps/yw/structures/closets/misc.dm index 5607a729a9..20185808cd 100644 --- a/maps/yw/structures/closets/misc.dm +++ b/maps/yw/structures/closets/misc.dm @@ -16,7 +16,7 @@ /obj/item/ammo_magazine/clip/c762/hunter = 9, /obj/item/gun/projectile/shotgun/pump/rifle = 2) -/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize() +/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize(mapload) if(prob(85)) starts_with += /obj/item/gun/projectile/shotgun/pump/rifle else @@ -55,7 +55,7 @@ /obj/item/cataloguer ) -/obj/structure/closet/secure_closet/explorer/Initialize() +/obj/structure/closet/secure_closet/explorer/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else @@ -125,7 +125,7 @@ /obj/item/cell/device, /obj/item/radio) -/obj/structure/closet/secure_closet/pilot/Initialize() +/obj/structure/closet/secure_closet/pilot/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else diff --git a/maps/yw/structures/closets/misc_vr.dm b/maps/yw/structures/closets/misc_vr.dm index 03a9410b0f..7bb2ac3157 100644 --- a/maps/yw/structures/closets/misc_vr.dm +++ b/maps/yw/structures/closets/misc_vr.dm @@ -110,7 +110,7 @@ /obj/item/reagent_containers/food/snacks/liquidprotein, /obj/item/cataloguer/compact/pathfinder) -/obj/structure/closet/secure_closet/pathfinder/Initialize() +/obj/structure/closet/secure_closet/pathfinder/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else diff --git a/maps/yw/structures/closets/security.dm b/maps/yw/structures/closets/security.dm index bb5e0d5271..1f14fbba86 100644 --- a/maps/yw/structures/closets/security.dm +++ b/maps/yw/structures/closets/security.dm @@ -22,7 +22,7 @@ /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/clothing/mask/gas/half) -/obj/structure/closet/secure_closet/hos_wardrobe/Initialize() +/obj/structure/closet/secure_closet/hos_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else diff --git a/maps/yw/submaps/_cryogaia_submaps.dm b/maps/yw/submaps/_cryogaia_submaps.dm index 1a0fee1690..7c9f06f2fa 100644 --- a/maps/yw/submaps/_cryogaia_submaps.dm +++ b/maps/yw/submaps/_cryogaia_submaps.dm @@ -194,7 +194,7 @@ /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each affect_ghosts = 1 -/obj/effect/step_trigger/zlevel_fall/Initialize() +/obj/effect/step_trigger/zlevel_fall/Initialize(mapload) . = ..() if(istype(get_turf(src), /turf/simulated/floor)) @@ -257,7 +257,7 @@ var/mob/living/simple_mob/my_mob var/depleted = FALSE -/obj/cryogaia_away_spawner/Initialize() +/obj/cryogaia_away_spawner/Initialize(mapload) . = ..() if(!LAZYLEN(mobs_to_pick_from)) diff --git a/maps/yw/submaps/aerostat/_aerostat.dm b/maps/yw/submaps/aerostat/_aerostat.dm index 2821de8d91..c9104a9fdc 100644 --- a/maps/yw/submaps/aerostat/_aerostat.dm +++ b/maps/yw/submaps/aerostat/_aerostat.dm @@ -125,7 +125,7 @@ color = "#eacd7c" BOR4_SET_ATMOS -/turf/unsimulated/floor/sky/bor4_sky/Initialize() +/turf/unsimulated/floor/sky/bor4_sky/Initialize(mapload) skyfall_levels = list(z+1) . = ..() diff --git a/maps/yw/submaps/alienship/_alienship.dm b/maps/yw/submaps/alienship/_alienship.dm index cc7b834ffc..c773dba86f 100644 --- a/maps/yw/submaps/alienship/_alienship.dm +++ b/maps/yw/submaps/alienship/_alienship.dm @@ -27,7 +27,7 @@ var/door_on_mode var/teleport_on_mode -/obj/away_mission_init/alienship/Initialize() +/obj/away_mission_init/alienship/Initialize(mapload) . = ..() if(!mission_mode) //WE ARE NUMBER ONE @@ -113,7 +113,7 @@ var/area/dump_area var/obj/shuttle_connector/shuttle_friend -/area/shuttle/excursion/away_alienship/Initialize() +/area/shuttle/excursion/away_alienship/Initialize(mapload) . = ..() dump_area = locate(/area/tether_away/alienship/equip_dump) diff --git a/maps/yw/submaps/rogue_mines/groundbase_things.dm b/maps/yw/submaps/rogue_mines/groundbase_things.dm index 0530007d71..c9dbb57f30 100644 --- a/maps/yw/submaps/rogue_mines/groundbase_things.dm +++ b/maps/yw/submaps/rogue_mines/groundbase_things.dm @@ -4,7 +4,8 @@ invisibility = 0 plane = TURF_PLANE layer = ABOVE_TURF_LAYER -/obj/effect/step_trigger/teleporter/to_mining/Initialize() + +/obj/effect/step_trigger/teleporter/to_mining/Initialize(mapload) . = ..() teleport_x = x teleport_y = y ++ @@ -17,7 +18,7 @@ plane = TURF_PLANE layer = ABOVE_TURF_LAYER -/obj/effect/step_trigger/teleporter/from_mining/Initialize() +/obj/effect/step_trigger/teleporter/from_mining/Initialize(mapload) . = ..() teleport_x = x teleport_y = y -- @@ -80,7 +81,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) var/area/shock_area = /area/centcom/terminal/tramfluff -/turf/simulated/floor/maglev/Initialize() +/turf/simulated/floor/maglev/Initialize(mapload) . = ..() shock_area = locate(shock_area) @@ -111,4 +112,4 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) /obj/effect/landmark/wildlife/forest name = "roaming wildlife" - wildlife_type = 2 \ No newline at end of file + wildlife_type = 2 diff --git a/maps/yw/submaps/space/_debrisfield.dm b/maps/yw/submaps/space/_debrisfield.dm index 7b06a3bfcc..9a8b5b4a0c 100644 --- a/maps/yw/submaps/space/_debrisfield.dm +++ b/maps/yw/submaps/space/_debrisfield.dm @@ -41,7 +41,7 @@ /obj/away_mission_init/debrisfield name = "away mission initializer - debrisfield" -/obj/away_mission_init/debrisfield/Initialize() +/obj/away_mission_init/debrisfield/Initialize(mapload) initialized = TRUE return INITIALIZE_HINT_QDEL @@ -74,4 +74,4 @@ name = "POI - Abandoned Derelict Bridge" /area/tether_away/debrisfield/derelict/interior - name = "POI - Abandoned Derelict Interior" \ No newline at end of file + name = "POI - Abandoned Derelict Interior" diff --git a/maps/yw/submaps/space/_guttersite.dm b/maps/yw/submaps/space/_guttersite.dm index 655c067f26..51fe7384b1 100644 --- a/maps/yw/submaps/space/_guttersite.dm +++ b/maps/yw/submaps/space/_guttersite.dm @@ -28,7 +28,7 @@ /obj/away_mission_init/guttersite name = "away mission initializer - guttersite" -/obj/away_mission_init/guttersite/Initialize() +/obj/away_mission_init/guttersite/Initialize(mapload) initialized = TRUE return INITIALIZE_HINT_QDEL diff --git a/maps/yw/submaps/underdark_pois/underdark_things.dm b/maps/yw/submaps/underdark_pois/underdark_things.dm index d58af0dc01..e0724e51d7 100644 --- a/maps/yw/submaps/underdark_pois/underdark_things.dm +++ b/maps/yw/submaps/underdark_pois/underdark_things.dm @@ -282,7 +282,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/shuttle/floor/voidcraft) VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/kafel_full/yellow) //Mechbay -/obj/mecha/working/ripley/abandoned/Initialize() - ..() +/obj/mecha/working/ripley/abandoned/Initialize(mapload) + . = ..() for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents) //Deletes the beacon so it can't be found easily - qdel(B) \ No newline at end of file + qdel(B) diff --git a/maps/yw/tether_phoronlock.dm b/maps/yw/tether_phoronlock.dm index 327b62cf0d..a1568eecaf 100644 --- a/maps/yw/tether_phoronlock.dm +++ b/maps/yw/tether_phoronlock.dm @@ -50,7 +50,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior var/frequency = 0 var/datum/radio_frequency/radio_connection -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize() +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize(mapload) . = ..() if(frequency) set_frequency(frequency) @@ -119,7 +119,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior /obj/machinery/embedded_controller/radio/airlock/phoron var/tag_scrubber -/obj/machinery/embedded_controller/radio/airlock/phoron/Initialize() +/obj/machinery/embedded_controller/radio/airlock/phoron/Initialize(mapload) . = ..() program = new/datum/computer/file/embedded_program/airlock/phoron(src) diff --git a/modular_chomp/code/datums/components/hearer.dm b/modular_chomp/code/datums/components/hearer.dm index 22470702f4..82b14d24a2 100644 --- a/modular_chomp/code/datums/components/hearer.dm +++ b/modular_chomp/code/datums/components/hearer.dm @@ -97,46 +97,46 @@ //Overmap ship definition (I have no idea why they use show_message?? but ok) -/obj/effect/overmap/visitable/ship/Initialize() +/obj/effect/overmap/visitable/ship/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) //Holopad definition -/obj/machinery/hologram/holopad/Initialize() +/obj/machinery/hologram/holopad/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) //UAV definition -/obj/item/uav/Initialize() +/obj/item/uav/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) //AIcard definition -/obj/item/aicard/Initialize() +/obj/item/aicard/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) //Tape recorder definition -/obj/item/taperecorder/Initialize() +/obj/item/taperecorder/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) //Portal definition -/obj/effect/map_effect/portal/master/Initialize() +/obj/effect/map_effect/portal/master/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) //Communicator definition -/obj/item/communicator/Initialize() +/obj/item/communicator/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) -/obj/item/paicard/Initialize() +/obj/item/paicard/Initialize(mapload) . = ..() hearer = AddComponent(/datum/component/hearer) diff --git a/modular_chomp/code/game/machinery/food_replicator.dm b/modular_chomp/code/game/machinery/food_replicator.dm index 157a9b164e..68618ad92d 100644 --- a/modular_chomp/code/game/machinery/food_replicator.dm +++ b/modular_chomp/code/game/machinery/food_replicator.dm @@ -32,7 +32,7 @@ /obj/item/stack/cable_coil = 5, ) -/obj/machinery/food_replicator/Initialize() +/obj/machinery/food_replicator/Initialize(mapload) . = ..() default_apply_parts() diff --git a/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm b/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm index 070f0af0da..ab597b7953 100644 --- a/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm +++ b/modular_chomp/code/game/machinery/virtual_reality/vr_console.dm @@ -24,13 +24,9 @@ light_color = "#FF0000" //var/global/list/vr_mob_tf_options // Global var located in global_list_ch.dm - -/obj/machinery/vr_sleeper/Initialize() +/obj/machinery/vr_sleeper/Initialize(mapload) . = ..() default_apply_parts() - -/obj/machinery/vr_sleeper/Initialize() - . = ..() smoke = new update_icon() diff --git a/modular_chomp/code/game/objects/effects/explosion.dm b/modular_chomp/code/game/objects/effects/explosion.dm index b38ae5ccbd..fadefb47ee 100644 --- a/modular_chomp/code/game/objects/effects/explosion.dm +++ b/modular_chomp/code/game/objects/effects/explosion.dm @@ -62,7 +62,8 @@ lightboom = 0 flash = 0 -/obj/effect/instantboom/Initialize() +/obj/effect/instantboom/Initialize(mapload) + ..() var/turf/T = get_turf(src) explosion(T,devastation,heavyboom,lightboom,flash) - qdel(src) + return INITIALIZE_HINT_QDEL diff --git a/modular_chomp/code/game/objects/items/devices/flipper.dm b/modular_chomp/code/game/objects/items/devices/flipper.dm index 86fb4e4d0d..5898643252 100644 --- a/modular_chomp/code/game/objects/items/devices/flipper.dm +++ b/modular_chomp/code/game/objects/items/devices/flipper.dm @@ -34,8 +34,8 @@ return module.attack_self(user) ..() -/obj/item/paicard/flipper/Initialize() //ChompEDIT New --> Initialize - ..() +/obj/item/paicard/flipper/Initialize(mapload) //ChompEDIT New --> Initialize + . = ..() desc = "The [name] is a versatile security device designed to protect and empower users in a variety of contexts. With features such as wireless hacking, radio analysis, signal jamming, and physical lock picking, the [name] is the ultimate tool for security professionals, hobbyists, and anyone seeking to better understand and defend against modern threats. Whether you're investigating a security breach, testing your own defenses, or simply curious about the workings of wireless technology, the [name] has you covered." MultiTool = new /obj/item/multitool(src) Signal = new /obj/item/assembly/signaler(src) diff --git a/modular_chomp/code/game/objects/items/weapons/storage/firstaid.dm b/modular_chomp/code/game/objects/items/weapons/storage/firstaid.dm index f9f2d5fa24..166474fae3 100644 --- a/modular_chomp/code/game/objects/items/weapons/storage/firstaid.dm +++ b/modular_chomp/code/game/objects/items/weapons/storage/firstaid.dm @@ -85,7 +85,7 @@ icon_state = "pill2" -/obj/item/reagent_containers/pill/neotane/Initialize() +/obj/item/reagent_containers/pill/neotane/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_NEOTANE, 10) color = reagents.get_color() @@ -95,7 +95,7 @@ desc = "An experimental pill." icon_state = "pill2" -/obj/item/reagent_containers/pill/burncard/Initialize() +/obj/item/reagent_containers/pill/burncard/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_BURNCARD, 10) color = reagents.get_color() @@ -105,7 +105,7 @@ desc = "An experimental pill." icon_state = "pill2" -/obj/item/reagent_containers/pill/flamecure/Initialize() +/obj/item/reagent_containers/pill/flamecure/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_FLAMECURE, 5) color = reagents.get_color() @@ -115,7 +115,7 @@ desc = "An experimental pill." icon_state = "pill2" -/obj/item/reagent_containers/pill/juggernog/Initialize() +/obj/item/reagent_containers/pill/juggernog/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_JUGGERNOG, 5) color = reagents.get_color() @@ -125,7 +125,7 @@ desc = "An experimental pill." icon_state = "pill2" -/obj/item/reagent_containers/pill/curea/Initialize() +/obj/item/reagent_containers/pill/curea/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_CUREA, 10) color = reagents.get_color() @@ -135,7 +135,7 @@ desc = "An experimental pill." icon_state = "pill2" -/obj/item/reagent_containers/pill/souldew/Initialize() +/obj/item/reagent_containers/pill/souldew/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SOULDEW, 10) color = reagents.get_color() @@ -146,8 +146,7 @@ desc = "An expirmental pill." icon_state = "pill2" -/obj/item/reagent_containers/pill/purifyingagent/Initialize() - +/obj/item/reagent_containers/pill/purifyingagent/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PURIFYINGAGENT, 10) @@ -158,7 +157,7 @@ desc = "A pill to help you concentrate." icon_state = "pill2" -/obj/item/reagent_containers/pill/methylphenidate/Initialize() +/obj/item/reagent_containers/pill/methylphenidate/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_METHYLPHENIDATE, 10) color = reagents.get_color() @@ -168,7 +167,7 @@ desc = "A pill to help treat severe depression." icon_state = "pill2" -/obj/item/reagent_containers/pill/paroxetine/Initialize() +/obj/item/reagent_containers/pill/paroxetine/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PAROXETINE, 10) color = reagents.get_color() @@ -178,7 +177,7 @@ desc = "A pill to help treat jitters, confusion, and blurred vision." icon_state = "pill2" -/obj/item/reagent_containers/pill/adranol/Initialize() +/obj/item/reagent_containers/pill/adranol/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_ADRANOL, 10) color = reagents.get_color() @@ -188,7 +187,7 @@ desc = "Just one couldn't hurt, right?" icon_state = "pill2" -/obj/item/reagent_containers/pill/aphrodisiac/Initialize() +/obj/item/reagent_containers/pill/aphrodisiac/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_APHRODISIAC, 20) color = reagents.get_color() diff --git a/modular_chomp/code/game/objects/random/mapping.dm b/modular_chomp/code/game/objects/random/mapping.dm index 0f7035833a..27e0af4df3 100644 --- a/modular_chomp/code/game/objects/random/mapping.dm +++ b/modular_chomp/code/game/objects/random/mapping.dm @@ -6,7 +6,7 @@ /obj/effect/map_helper icon = 'icons/misc/map_helpers.dmi' -/obj/effect/map_helper/Initialize() +/obj/effect/map_helper/Initialize(mapload) . = ..() return INITIALIZE_HINT_LATELOAD @@ -124,4 +124,4 @@ Make this if you can figure out a way to do it for every area in that z level ex var/area/A = get_area(src) if(A) A.flags |= PHASE_SHIELDED - qdel(src) \ No newline at end of file + qdel(src) diff --git a/modular_chomp/code/game/objects/structures/crate_lockers/closets/secure/security.dm b/modular_chomp/code/game/objects/structures/crate_lockers/closets/secure/security.dm index 7a0ac947a7..e92e900150 100644 --- a/modular_chomp/code/game/objects/structures/crate_lockers/closets/secure/security.dm +++ b/modular_chomp/code/game/objects/structures/crate_lockers/closets/secure/security.dm @@ -116,7 +116,7 @@ /obj/item/clothing/mask/gas/half, /obj/item/clothing/mask/gas/sechailer/swat/hos) -/obj/structure/closet/secure_closet/hos/Initialize() +/obj/structure/closet/secure_closet/hos/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else @@ -175,7 +175,7 @@ /obj/item/retail_scanner/security //CHOMPStation addition ) -/obj/structure/closet/secure_closet/warden/Initialize() +/obj/structure/closet/secure_closet/warden/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else @@ -220,7 +220,7 @@ /obj/item/ticket_printer //CHOMPStation addition ) -/obj/structure/closet/secure_closet/security/Initialize() +/obj/structure/closet/secure_closet/security/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else @@ -231,22 +231,22 @@ starts_with += /obj/item/poster/nanotrasen return ..() -/obj/structure/closet/secure_closet/security/cargo/Initialize() +/obj/structure/closet/secure_closet/security/cargo/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/cargo starts_with += /obj/item/encryptionkey/headset_cargo return ..() -/obj/structure/closet/secure_closet/security/engine/Initialize() +/obj/structure/closet/secure_closet/security/engine/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/engine starts_with += /obj/item/encryptionkey/headset_eng return ..() -/obj/structure/closet/secure_closet/security/science/Initialize() +/obj/structure/closet/secure_closet/security/science/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/science starts_with += /obj/item/encryptionkey/headset_sci return ..() -/obj/structure/closet/secure_closet/security/med/Initialize() +/obj/structure/closet/secure_closet/security/med/Initialize(mapload) starts_with += /obj/item/clothing/accessory/armband/medblue starts_with += /obj/item/encryptionkey/headset_med return ..() diff --git a/modular_chomp/code/game/objects/structures/crate_lockers/largecrate.dm b/modular_chomp/code/game/objects/structures/crate_lockers/largecrate.dm index 9920576c9f..726d709806 100644 --- a/modular_chomp/code/game/objects/structures/crate_lockers/largecrate.dm +++ b/modular_chomp/code/game/objects/structures/crate_lockers/largecrate.dm @@ -14,7 +14,7 @@ name = "Dangerous drone carrier" starts_with = list(/mob/living/simple_mob/vore/sect_drone) -/obj/structure/largecrate/animal/bugsect/Initialize() +/obj/structure/largecrate/animal/bugsect/Initialize(mapload) starts_with = list(pick(/mob/living/simple_mob/vore/sect_drone, /mob/living/simple_mob/vore/sect_queen)) return ..() @@ -47,4 +47,4 @@ /obj/structure/largecrate/animal/gravityshell name = "Exotic crate" desc = "WARNING: HAZARDOUS CONTENTS. HANDLE WITH CAUTION" - starts_with = list(/mob/living/simple_mob/vore/spacecritter/gravityshell) \ No newline at end of file + starts_with = list(/mob/living/simple_mob/vore/spacecritter/gravityshell) diff --git a/modular_chomp/code/game/objects/structures/watercloset_ch.dm b/modular_chomp/code/game/objects/structures/watercloset_ch.dm index 6ff71b2a5c..e627e0bbd3 100644 --- a/modular_chomp/code/game/objects/structures/watercloset_ch.dm +++ b/modular_chomp/code/game/objects/structures/watercloset_ch.dm @@ -12,7 +12,7 @@ var/total_w = 0 var/panic_mult = 1 -/obj/structure/toilet/Initialize() +/obj/structure/toilet/Initialize(mapload) if(z in global.using_map.map_levels) teleplumbed = TRUE exit_landmark = locate(/obj/effect/landmark/teleplumb_exit) @@ -133,7 +133,7 @@ var/mob/living/simple_mob/vore/aggressive/corrupthound/muffinmonster var/obj/machinery/recycling/crusher/crusher //Bluespace connection for recyclables -/obj/structure/biowaste_tank/Initialize() +/obj/structure/biowaste_tank/Initialize(mapload) muffinmonster = new /mob/living/simple_mob/vore/aggressive/corrupthound/muffinmonster(src) muffinmonster.name = "Activate Muffin Monster" muffinmonster.voremob_loaded = TRUE diff --git a/modular_chomp/code/game/turfs/simulated/alien.dm b/modular_chomp/code/game/turfs/simulated/alien.dm index 32d58d610f..f98c3ccc50 100644 --- a/modular_chomp/code/game/turfs/simulated/alien.dm +++ b/modular_chomp/code/game/turfs/simulated/alien.dm @@ -7,7 +7,7 @@ light_color = "#FF3300" // Orangeish? light_on = TRUE -/turf/simulated/shuttle/wall/alien/orange/Initialize() +/turf/simulated/shuttle/wall/alien/orange/Initialize(mapload) . = ..() update_light() @@ -25,4 +25,4 @@ icon_state = "hull-r_titanium" /turf/simulated/wall/quartz/Initialize(mapload) - . = ..(mapload, MAT_QUARTZ, MAT_QUARTZ, MAT_QUARTZ) \ No newline at end of file + . = ..(mapload, MAT_QUARTZ, MAT_QUARTZ, MAT_QUARTZ) diff --git a/modular_chomp/code/modules/clothing/gloves/antagonist.dm b/modular_chomp/code/modules/clothing/gloves/antagonist.dm index cbc103f89f..42bc8b3d00 100644 --- a/modular_chomp/code/modules/clothing/gloves/antagonist.dm +++ b/modular_chomp/code/modules/clothing/gloves/antagonist.dm @@ -12,7 +12,7 @@ /obj/item/clothing/gloves/ring/buzzer/get_cell() return battery -/obj/item/clothing/gloves/ring/buzzer/Initialize() +/obj/item/clothing/gloves/ring/buzzer/Initialize(mapload) . = ..() if(!battery) battery = new battery_type(src) diff --git a/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm b/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm index 9c9ce61c55..b03f07db22 100644 --- a/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm +++ b/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm @@ -57,7 +57,7 @@ icon_state = "leaves" bitesize = 1 -/obj/item/reagent_containers/food/snacks/weatherlily/Initialize() +/obj/item/reagent_containers/food/snacks/weatherlily/Initialize(mapload) . = ..() //reagents.add_reagent(REAGENT_ID_AMATOXIN, 1) I want this for lore of this being a strange bioenginered thing to mess with organic things buuuut it's one of two food sources reagents.add_reagent(REAGENT_ID_LUMINOL,1) @@ -124,7 +124,7 @@ nutriment_desc = list(REAGENT_ID_PROTEIN = 4) bitesize = 2 -/obj/item/reagent_containers/food/snacks/mutatedmeat/Initialize() +/obj/item/reagent_containers/food/snacks/mutatedmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 4) @@ -138,7 +138,7 @@ var/static/list/possible_states = list("crystal", "generator","core", "hilt") var/static/list/possible_tech = list(TECH_MATERIAL, TECH_ENGINEERING, TECH_PHORON, TECH_POWER, TECH_BIO, TECH_COMBAT, TECH_MAGNET, TECH_DATA) -/obj/item/prop/alien/prototype/Initialize() +/obj/item/prop/alien/prototype/Initialize(mapload) . = ..() icon_state = pick(possible_states) var/list/techs = possible_tech.Copy() diff --git a/modular_chomp/code/modules/food/food/drinks/bottle.dm b/modular_chomp/code/modules/food/food/drinks/bottle.dm index eb7f6efb45..2e1ded8f48 100644 --- a/modular_chomp/code/modules/food/food/drinks/bottle.dm +++ b/modular_chomp/code/modules/food/food/drinks/bottle.dm @@ -6,6 +6,6 @@ center_of_mass_x = 17 //CHOMPEdit center_of_mass_y= 3 //CHOMPEdit -/obj/item/reagent_containers/food/drinks/bottle/snaps/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/snaps/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_SNAPS, 100) diff --git a/modular_chomp/code/modules/food/food/snacks/meat.dm b/modular_chomp/code/modules/food/food/snacks/meat.dm index 81ebeb19dd..735866b829 100644 --- a/modular_chomp/code/modules/food/food/snacks/meat.dm +++ b/modular_chomp/code/modules/food/food/snacks/meat.dm @@ -8,7 +8,7 @@ nutriment_desc = list(REAGENT_ID_PROTEIN = 6, REAGENT_ID_DEATHBLOOD = 6) bitesize = 6 -/obj/item/reagent_containers/food/snacks/deathclawmeat/Initialize() +/obj/item/reagent_containers/food/snacks/deathclawmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_DEATHBLOOD, 6) @@ -23,7 +23,7 @@ nutriment_desc = list(REAGENT_ID_PROTEIN = 6, REAGENT_ID_LIQUIDFIRE = 6) bitesize = 6 -/obj/item/reagent_containers/food/snacks/dragonmeat/Initialize() +/obj/item/reagent_containers/food/snacks/dragonmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_LIQUIDFIRE, 6) @@ -38,7 +38,7 @@ nutriment_desc = list(REAGENT_ID_PROTEIN = 6, REAGENT_ID_NEOLIQUIDFIRE = 6, REAGENT_ID_PHORON = 3) bitesize = 6 -/obj/item/reagent_containers/food/snacks/phorondragonmeat/Initialize() +/obj/item/reagent_containers/food/snacks/phorondragonmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_NEOLIQUIDFIRE, 6) @@ -54,7 +54,7 @@ nutriment_desc = list(REAGENT_ID_PROTEIN = 3, REAGENT_ID_LIQUIDLIFE = 3) bitesize = 6 -/obj/item/reagent_containers/food/snacks/metroidmeat/Initialize() +/obj/item/reagent_containers/food/snacks/metroidmeat/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_LIQUIDLIFE, 3) diff --git a/modular_chomp/code/modules/halloween/items.dm b/modular_chomp/code/modules/halloween/items.dm index 8f263384bb..a944a96430 100644 --- a/modular_chomp/code/modules/halloween/items.dm +++ b/modular_chomp/code/modules/halloween/items.dm @@ -136,7 +136,7 @@ /obj/structure/candybowl/medical name = "medical candy bowl" -/obj/structure/candybowl/medical/Initialize() +/obj/structure/candybowl/medical/Initialize(mapload) . = ..() candy += list( /obj/item/clothing/mask/chewable/candy/lolli, @@ -147,7 +147,7 @@ /obj/structure/candybowl/engineering name = "engineering candy bowl" -/obj/structure/candybowl/engineering/Initialize() +/obj/structure/candybowl/engineering/Initialize(mapload) . = ..() candy += list( /obj/item/reagent_containers/food/snacks/welders_original, @@ -158,7 +158,7 @@ /obj/structure/candybowl/cargo name = "cargo candy bowl" -/obj/structure/candybowl/cargo/Initialize() +/obj/structure/candybowl/cargo/Initialize(mapload) . = ..() candy += list( /obj/item/reagent_containers/food/snacks/butterscotch, @@ -169,7 +169,7 @@ /obj/structure/candybowl/science name = "science candy bowl" -/obj/structure/candybowl/science/Initialize() +/obj/structure/candybowl/science/Initialize(mapload) . = ..() candy += list( /obj/item/reagent_containers/food/snacks/reishicup, @@ -181,7 +181,7 @@ /obj/structure/candybowl/security name = "security candy bowl" -/obj/structure/candybowl/security/Initialize() +/obj/structure/candybowl/security/Initialize(mapload) . = ..() candy += list( /obj/item/reagent_containers/food/snacks/spicy_boys, @@ -200,7 +200,7 @@ var/list/ckeys_that_took = list() var/list/costumes -/obj/structure/boxpile/Initialize() +/obj/structure/boxpile/Initialize(mapload) . = ..() costumes = typesof(/obj/item/storage/box/halloween/) diff --git a/modular_chomp/code/modules/halloween/snacks.dm b/modular_chomp/code/modules/halloween/snacks.dm index 1fe30ba590..3589abda41 100644 --- a/modular_chomp/code/modules/halloween/snacks.dm +++ b/modular_chomp/code/modules/halloween/snacks.dm @@ -2,7 +2,7 @@ name = "rotten egg" desc = "A rotten egg. It stinks!" -/obj/item/reagent_containers/food/snacks/egg/rotten/Initialize() +/obj/item/reagent_containers/food/snacks/egg/rotten/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_TOXIN, 3) diff --git a/modular_chomp/code/modules/mob/living/carbon/carbon.dm b/modular_chomp/code/modules/mob/living/carbon/carbon.dm index 2b1363079d..b092fa4efb 100644 --- a/modular_chomp/code/modules/mob/living/carbon/carbon.dm +++ b/modular_chomp/code/modules/mob/living/carbon/carbon.dm @@ -3,7 +3,7 @@ var/slip_reflex = FALSE var/synth_reag_processing = TRUE -/mob/living/carbon/Initialize() +/mob/living/carbon/Initialize(mapload) . = ..() cozyloop = new(list(src), FALSE) diff --git a/modular_chomp/code/modules/mob/living/living.dm b/modular_chomp/code/modules/mob/living/living.dm index 6c21748a30..6bb3214da5 100644 --- a/modular_chomp/code/modules/mob/living/living.dm +++ b/modular_chomp/code/modules/mob/living/living.dm @@ -22,7 +22,7 @@ var/scream_emote = null */ -/mob/living/Initialize() +/mob/living/Initialize(mapload) . = ..() deaf_loop = new(list(src), FALSE) diff --git a/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm b/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm index e108323038..f4de90d443 100644 --- a/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm +++ b/modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm @@ -110,8 +110,8 @@ attack_edge = 1 attack_armor_type = "melee" //Default is melee but I'm stating this explicitly to make it more obvious to anybody reading this -/mob/living/simple_mob/animal/synx/Initialize() - ..() +/mob/living/simple_mob/animal/synx/Initialize(mapload) + . = ..() src.adjust_nutrition(src.max_nutrition) build_icons(1) voremob_loaded = 1 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm index 47910c3df5..72d5a61b4c 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm @@ -7,7 +7,7 @@ var/body_color -/mob/living/simple_mob/animal/space/carp/station/Initialize() +/mob/living/simple_mob/animal/space/carp/station/Initialize(mapload) .=..() body_color = pick(list("green","red","orange","yellow","blue")) @@ -20,4 +20,4 @@ if(body_color == "yellow") color = "#00FF00" if(body_color == "blue") - color = "#0099CC" \ No newline at end of file + color = "#0099CC" diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm index e34b3df09c..bd4c773f0b 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm @@ -238,7 +238,7 @@ var/splatter_volume = 5 // The volume of its chemical container, for said cloud of reagents. var/list/my_chems = list(REAGENT_ID_MOLD) -/obj/item/projectile/arc/vial/Initialize() +/obj/item/projectile/arc/vial/Initialize(mapload) . = ..() if(splatter) create_reagents(splatter_volume) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm index f200cd8e90..81b122f93b 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm @@ -577,7 +577,7 @@ disable_duration_percent = 0 -/mob/living/simple_mob/mechanical/mecha/imperion/Initialize() +/mob/living/simple_mob/mechanical/mecha/imperion/Initialize(mapload) add_modifier(/datum/modifier/bossbuff, null, src) // Slime is always swole. return ..() diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm index e9eab00451..bf4d991747 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm @@ -608,7 +608,7 @@ stage = 2 sealed = TRUE -/obj/item/grenade/chem_grenade/frost/Initialize() +/obj/item/grenade/chem_grenade/frost/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm index 612d823c92..0420109418 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm @@ -191,7 +191,7 @@ /obj/item/rig_module/teleporter = 5 ) -/mob/living/simple_mob/humanoid/eclipse/head/engineer/Initialize() +/mob/living/simple_mob/humanoid/eclipse/head/engineer/Initialize(mapload) add_modifier(/datum/modifier/technomancer/haste, null, src) // tesh goes nyooooom return ..() @@ -656,4 +656,4 @@ if(prob(50)) bomb_lines(A) else - chaos_lines(A) \ No newline at end of file + chaos_lines(A) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/tradercode.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/tradercode.dm index 2375460635..d4c1ac83a8 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/tradercode.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/starhunters/tradercode.dm @@ -28,7 +28,7 @@ var/list/product_records = list() -/mob/living/simple_mob/humanoid/starhunter/trader/Initialize() +/mob/living/simple_mob/humanoid/starhunter/trader/Initialize(mapload) . = ..() build_inventory() diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm index 0bf234c4cc..3015906761 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm @@ -67,7 +67,7 @@ pain_emote_1p = list("skree") pain_emote_3p = list("skrees") -/mob/living/simple_mob/metroid/Initialize() +/mob/living/simple_mob/metroid/Initialize(mapload) nutrition = 100 //Have them start off pretty hungry still. add_verb(src,/mob/living/proc/ventcrawl) //CHOMPEdit TGPanel //May not do anything at the moment. return ..() diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm index dc2cb7e975..c51366c90e 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm @@ -21,7 +21,7 @@ var/amount_grown = 0 var/metroid_type = /mob/living/simple_mob/metroid/juvenile/baby -/obj/effect/metroid/egg/Initialize() +/obj/effect/metroid/egg/Initialize(mapload) pixel_x = rand(3,-3) pixel_y = rand(3,-3) START_PROCESSING(SSobj, src) @@ -39,4 +39,4 @@ amount_grown += rand(0,2) if(amount_grown >= 100) new metroid_type(src.loc, src) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm index 218e17183d..6fc0d2b184 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm @@ -217,7 +217,7 @@ coretype = /obj/item/slime_extract/ruby melee_attack_delay = 1 SECOND -/mob/living/simple_mob/slime/feral/ruby/Initialize() +/mob/living/simple_mob/slime/feral/ruby/Initialize(mapload) add_modifier(/datum/modifier/slime_strength, null, src) // Slime is always swole. return ..() diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm index 47670c985a..eec387b144 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm @@ -781,7 +781,7 @@ GLOBAL_LIST_INIT(obelisk_lure_messages, list( // hackified shitcode poached from the pitcher plant for ~~cool flavor text~~ when you're near either 'structure' -/mob/living/simple_mob/vore/blackhole_obelisk/Initialize() +/mob/living/simple_mob/vore/blackhole_obelisk/Initialize(mapload) . = ..() obelisk_lure_messages = GLOB.obelisk_lure_messages loopy = new(list(src),FALSE) @@ -851,21 +851,21 @@ GLOBAL_LIST_INIT(obelisk_lure_messages, list( ///size randomization!/// ///-------------------------------------------------------------------------------------------------------------------------------------------------------------/// -/mob/living/simple_mob/vore/blackhole/Initialize() +/mob/living/simple_mob/vore/blackhole/Initialize(mapload) . = ..() var/oursize = rand(90, 150) / 100 resize(oursize) -/mob/living/simple_mob/vore/blackhole/bikers/Initialize() +/mob/living/simple_mob/vore/blackhole/bikers/Initialize(mapload) . = ..() resize(1) // Scale them back down -/mob/living/simple_mob/vore/otie/syndicate/blackhole/Initialize() +/mob/living/simple_mob/vore/otie/syndicate/blackhole/Initialize(mapload) . = ..() var/oursize = rand(100, 180) / 100 resize(oursize) -/mob/living/simple_mob/humanoid/merc/ranged/sniper/blackhole/Initialize() +/mob/living/simple_mob/humanoid/merc/ranged/sniper/blackhole/Initialize(mapload) . = ..() var/oursize = rand(100, 180) / 100 resize(oursize) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm index 07b5144bd6..b80301d40a 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm @@ -1,3 +1,3 @@ -/mob/living/simple_mob/vore/greatwolf/Initialize() +/mob/living/simple_mob/vore/greatwolf/Initialize(mapload) . = ..() add_verb(src,/mob/living/simple_mob/proc/pick_color) //CHOMPEdit TGPanel diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm index 219ecc3036..ed3bb78001 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm @@ -52,7 +52,7 @@ /mob/living/simple_mob/animal/passive/cockroach) var/obj/item/vac_attachment/swoopie/Vac -/mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/Initialize() +/mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/Initialize(mapload) . = ..() if(!voremob_loaded) voremob_loaded = TRUE diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index 1e9c2a8e32..affeda6b3d 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -1,4 +1,4 @@ -/mob/living/simple_mob/vore/wolf/direwolf/Initialize() +/mob/living/simple_mob/vore/wolf/direwolf/Initialize(mapload) . = ..() add_verb(src,/mob/living/simple_mob/proc/pick_color) //CHOMPEdit TGPanel /* Combat refactor walkback. 100 old diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm index 9aff323db7..b718b3eca3 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm @@ -39,14 +39,14 @@ /obj/item/reagent_containers/food/snacks/meat/xeyakin -/obj/item/reagent_containers/food/snacks/meat/xeyakin/Initialize() +/obj/item/reagent_containers/food/snacks/meat/xeyakin/Initialize(mapload) . = ..() - reagents.add_reagent("xeyakinblood", 2) + reagents.add_reagent(REAGENT_ID_XEYAKIN_BLOOD, 2) /datum/reagent/xeyakinblood - name = "Xeyakin Blood" - id = "xeyakinblood" + name = REAGENT_XEYAKIN_BLOOD + id = REAGENT_ID_XEYAKIN_BLOOD description = "The blood of a legendary beast." taste_description = "divine" taste_mult = 1.5 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm index 127d558aae..7a648f46de 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm @@ -91,8 +91,8 @@ can_be_drop_prey = FALSE //CHOMP Add -/mob/living/simple_mob/xeno_ch/Initialize() - ..() +/mob/living/simple_mob/xeno_ch/Initialize(mapload) + . = ..() src.adjust_nutrition(src.max_nutrition) sight |= SEE_MOBS diff --git a/modular_chomp/code/modules/paperwork/filingcabinet.dm b/modular_chomp/code/modules/paperwork/filingcabinet.dm index dfb84e0b60..223e9de72b 100644 --- a/modular_chomp/code/modules/paperwork/filingcabinet.dm +++ b/modular_chomp/code/modules/paperwork/filingcabinet.dm @@ -25,7 +25,7 @@ icon_state = "tallcabinet" -/obj/structure/filingcabinet/Initialize() +/obj/structure/filingcabinet/Initialize(mapload) for(var/obj/item/I in loc) if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo) || istype(I, /obj/item/paper_bundle)) I.loc = src diff --git a/modular_chomp/code/modules/power/cells/power_cells.dm b/modular_chomp/code/modules/power/cells/power_cells.dm index b8ce893b41..9a9190723d 100644 --- a/modular_chomp/code/modules/power/cells/power_cells.dm +++ b/modular_chomp/code/modules/power/cells/power_cells.dm @@ -195,7 +195,7 @@ icon_state = "em_light" w_class = ITEMSIZE_TINY -/obj/item/cell/emergency_light/Initialize() +/obj/item/cell/emergency_light/Initialize(mapload) . = ..() var/area/A = get_area(src) if(!A.lightswitch || !A.light_power) @@ -215,7 +215,7 @@ var/amount = 100 var/used = FALSE -/obj/item/fbp_backup_cell/Initialize() +/obj/item/fbp_backup_cell/Initialize(mapload) . = ..() add_overlay("[icon_state]_100") diff --git a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm index 0532b248a1..73c508fbd8 100644 --- a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm +++ b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm @@ -14,7 +14,7 @@ var/is_picked_up = FALSE var/is_long = TRUE -/obj/item/gun/projectile/automatic/serdy/Initialize() +/obj/item/gun/projectile/automatic/serdy/Initialize(mapload) . = ..() update_transform() update_icon() @@ -1119,7 +1119,7 @@ icon_state = "c20r" return -/obj/item/gun/projectile/automatic/c20r/Initialize() +/obj/item/gun/projectile/automatic/c20r/Initialize(mapload) . = ..() update_transform() @@ -1137,7 +1137,7 @@ . = ..() icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-e" -/obj/item/gun/projectile/automatic/sts35/Initialize() +/obj/item/gun/projectile/automatic/sts35/Initialize(mapload) . = ..() update_transform() @@ -1156,7 +1156,7 @@ . = ..() icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-e" */ -/obj/item/gun/projectile/automatic/wt550/Initialize() +/obj/item/gun/projectile/automatic/wt550/Initialize(mapload) . = ..() update_transform() @@ -1178,7 +1178,7 @@ icon_state = "carbine-e" return -/obj/item/gun/projectile/automatic/z8/Initialize() +/obj/item/gun/projectile/automatic/z8/Initialize(mapload) . = ..() update_transform() @@ -1201,7 +1201,7 @@ . = ..() icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-empty" -/obj/item/gun/projectile/automatic/mini_uzi/Initialize() +/obj/item/gun/projectile/automatic/mini_uzi/Initialize(mapload) . = ..() update_transform() @@ -1243,7 +1243,7 @@ icon = 'icons/obj/gun_ch.dmi' icon_state = "m1911" -/obj/item/gun/projectile/colt/Initialize() +/obj/item/gun/projectile/colt/Initialize(mapload) .=..() update_icon() @@ -1380,7 +1380,7 @@ var/is64x32 = TRUE var/is_picked_up = FALSE -/obj/item/gun/projectile/shotgun/pump/Initialize() +/obj/item/gun/projectile/shotgun/pump/Initialize(mapload) . = ..() if(is64x32) update_transform() @@ -1475,7 +1475,7 @@ /obj/item/gun/projectile/shotgun/doublebarrel/sawn //Default sawn shotgun needs it's old icon path back icon = 'icons/obj/gun.dmi' -/obj/item/gun/projectile/shotgun/doublebarrel/Initialize() +/obj/item/gun/projectile/shotgun/doublebarrel/Initialize(mapload) . = ..() update_transform() update_icon() diff --git a/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm b/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm index 71903e55ac..9842b4ec76 100644 --- a/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm +++ b/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm @@ -71,7 +71,7 @@ REAGENT_ID_COPPER, REAGENT_ID_MERCURY, REAGENT_ID_RADIUM, REAGENT_ID_WATER, REAGENT_ID_ETHANOL, REAGENT_ID_SUGAR, REAGENT_ID_SACID, REAGENT_ID_TUNGSTEN, REAGENT_ID_CALCIUM ) -/obj/machinery/chemical_synthesizer/Initialize() +/obj/machinery/chemical_synthesizer/Initialize(mapload) . = ..() // Create the reagents datum which will act as the machine's reaction vessel. create_reagents(600) diff --git a/modular_chomp/code/modules/recycling/v_garbosystem.dm b/modular_chomp/code/modules/recycling/v_garbosystem.dm index 82c46a6d0a..6dc0195662 100644 --- a/modular_chomp/code/modules/recycling/v_garbosystem.dm +++ b/modular_chomp/code/modules/recycling/v_garbosystem.dm @@ -14,7 +14,7 @@ var/list/affecting var/voracity = 5 //How much stuff is swallowed at once. -/obj/machinery/v_garbosystem/Initialize() +/obj/machinery/v_garbosystem/Initialize(mapload) . = ..() for(var/dir in cardinal) src.crusher = locate(/obj/machinery/recycling/crusher, get_step(src, dir)) diff --git a/modular_chomp/code/modules/vore/eating/soulcatcher.dm b/modular_chomp/code/modules/vore/eating/soulcatcher.dm index e94b862542..bfc5dbc193 100644 --- a/modular_chomp/code/modules/vore/eating/soulcatcher.dm +++ b/modular_chomp/code/modules/vore/eating/soulcatcher.dm @@ -31,7 +31,7 @@ return ..() + saving // Load the vars_to_save from the savefile -/obj/soulgem/Initialize() +/obj/soulgem/Initialize(mapload) . = ..() if(ismob(loc)) owner = loc diff --git a/modular_chomp/game/effects/spawner.dm b/modular_chomp/game/effects/spawner.dm index 743d1c10ee..c279f19935 100644 --- a/modular_chomp/game/effects/spawner.dm +++ b/modular_chomp/game/effects/spawner.dm @@ -6,9 +6,9 @@ GLOBAL_LIST_EMPTY(button_mob_spawner_landmark) icon_state = "expirmentalaid" var/link = "MOBSPAWN" -/obj/effect/landmark/button_mob_spawner_landmark/Initialize() +/obj/effect/landmark/button_mob_spawner_landmark/Initialize(mapload) . = ..() GLOB.button_mob_spawner_landmark[link] = src /obj/effect/landmark/button_mob_spawner_landmark/second - link = "MOBSPAWNSECOND" \ No newline at end of file + link = "MOBSPAWNSECOND" diff --git a/modular_chomp/game/machinery/bluespace_denier.dm b/modular_chomp/game/machinery/bluespace_denier.dm index 99b7b30569..8402a92d5f 100644 --- a/modular_chomp/game/machinery/bluespace_denier.dm +++ b/modular_chomp/game/machinery/bluespace_denier.dm @@ -14,7 +14,7 @@ idle_power_usage = 2 var/timerid -/obj/machinery/bluespace_denier/Initialize() +/obj/machinery/bluespace_denier/Initialize(mapload) . = ..() // if already anchored, setup the proxity check timerid = addtimer(CALLBACK(src, PROC_REF(start_up)), 10 SECONDS, TIMER_STOPPABLE) diff --git a/modular_chomp/game/objects/effects/step_triggers.dm b/modular_chomp/game/objects/effects/step_triggers.dm index 4499acee31..378f68caac 100644 --- a/modular_chomp/game/objects/effects/step_triggers.dm +++ b/modular_chomp/game/objects/effects/step_triggers.dm @@ -1,4 +1,4 @@ -/obj/effect/step_trigger/teleporter/deathfall/Initialize() +/obj/effect/step_trigger/teleporter/deathfall/Initialize(mapload) . = ..() teleport_z = src.z //This is for use in gateways, so mappers can hard map the X and Y without worrying about going to brazil @@ -33,6 +33,6 @@ message_admins("ERROR: planetary_fall step trigger lacks a planet to fall onto.") return -/obj/effect/step_trigger/teleporter/poi/Initialize() //This is for placing teleporters in gateways/POIS, where Z levels can be different and I cant be assed to make fake teleporter stairs +/obj/effect/step_trigger/teleporter/poi/Initialize(mapload) //This is for placing teleporters in gateways/POIS, where Z levels can be different and I cant be assed to make fake teleporter stairs . = ..() teleport_z = src.z diff --git a/modular_chomp/maps/relic_base/overmap/sectors.dm b/modular_chomp/maps/relic_base/overmap/sectors.dm index ef73870a1a..31aa9f04a1 100644 --- a/modular_chomp/maps/relic_base/overmap/sectors.dm +++ b/modular_chomp/maps/relic_base/overmap/sectors.dm @@ -29,7 +29,7 @@ icecaps = "icecaps" icon_state = "lush" //yeet -/obj/effect/overmap/visitable/planet/Thor/Initialize() +/obj/effect/overmap/visitable/planet/Thor/Initialize(mapload) atmosphere = new(CELL_VOLUME) atmosphere.adjust_gas_temp(GAS_O2, MOLES_O2STANDARD, 273) atmosphere.adjust_gas_temp(GAS_N2, MOLES_N2STANDARD, 273) @@ -39,7 +39,7 @@ /obj/effect/overmap/visitable/planet/Thor/get_space_zlevels() return list(Z_LEVEL_CARRIER) -/obj/effect/overmap/visitable/planet/Thor/Initialize() +/obj/effect/overmap/visitable/planet/Thor/Initialize(mapload) . = ..() docking_codes = null diff --git a/modular_chomp/maps/relic_base/relicbase_defines.dm b/modular_chomp/maps/relic_base/relicbase_defines.dm index 621c8238ed..fe15aa2428 100644 --- a/modular_chomp/maps/relic_base/relicbase_defines.dm +++ b/modular_chomp/maps/relic_base/relicbase_defines.dm @@ -348,37 +348,37 @@ Z_LEVEL_CATACOMBS ) -/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize(mapload) teleport_x = src.x - 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize(mapload) teleport_x = src.x - 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize(mapload) teleport_x = src.x + 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize(mapload) teleport_x = src.x + 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize() +/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize(mapload) teleport_x = src.x teleport_y = src.y - 4 teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize() +/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize(mapload) teleport_x = src.x teleport_y = src.y + 4 teleport_z = src.z diff --git a/modular_chomp/maps/relic_base/relicbase_overrides.dm b/modular_chomp/maps/relic_base/relicbase_overrides.dm index 5458cb51da..2626c72147 100644 --- a/modular_chomp/maps/relic_base/relicbase_overrides.dm +++ b/modular_chomp/maps/relic_base/relicbase_overrides.dm @@ -4,7 +4,7 @@ /mob/living/silicon/robot/platform/cargo req_access = list(access_cargo_bot) -/obj/item/card/id/platform/Initialize() +/obj/item/card/id/platform/Initialize(mapload) . = ..() access |= access_explorer access |= access_pilot diff --git a/modular_chomp/maps/relic_base/relicbase_things.dm b/modular_chomp/maps/relic_base/relicbase_things.dm index d9513707c9..3167ced135 100644 --- a/modular_chomp/maps/relic_base/relicbase_things.dm +++ b/modular_chomp/maps/relic_base/relicbase_things.dm @@ -43,7 +43,7 @@ var/area/shock_area = /area/hallway/primary // We use this, given our current tram /areas/ are set to this. Clean this up later if we give tram halls their own dedicated /area/ -/turf/simulated/floor/maglev/Initialize() +/turf/simulated/floor/maglev/Initialize(mapload) . = ..() shock_area = locate(shock_area) diff --git a/modular_chomp/maps/relic_base/structures/closets/engineering.dm b/modular_chomp/maps/relic_base/structures/closets/engineering.dm index 30f22f800f..e66c96ff9d 100644 --- a/modular_chomp/maps/relic_base/structures/closets/engineering.dm +++ b/modular_chomp/maps/relic_base/structures/closets/engineering.dm @@ -22,7 +22,7 @@ /obj/item/taperoll/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering) -/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize() +/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else diff --git a/modular_chomp/maps/relic_base/structures/closets/medical.dm b/modular_chomp/maps/relic_base/structures/closets/medical.dm index 5af03b5151..3c5a9c5634 100644 --- a/modular_chomp/maps/relic_base/structures/closets/medical.dm +++ b/modular_chomp/maps/relic_base/structures/closets/medical.dm @@ -21,7 +21,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/shoes/white) -/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize() +/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/medic else diff --git a/modular_chomp/maps/relic_base/structures/closets/misc.dm b/modular_chomp/maps/relic_base/structures/closets/misc.dm index a00497678b..d0b9222806 100644 --- a/modular_chomp/maps/relic_base/structures/closets/misc.dm +++ b/modular_chomp/maps/relic_base/structures/closets/misc.dm @@ -16,7 +16,7 @@ /obj/item/ammo_magazine/clip/c762/hunter = 9, /obj/item/gun/projectile/shotgun/pump/rifle = 2) -/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize() +/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize(mapload) if(prob(85)) starts_with += /obj/item/gun/projectile/shotgun/pump/rifle else @@ -58,7 +58,7 @@ /obj/item/cataloguer ) -/obj/structure/closet/secure_closet/explorer/Initialize() +/obj/structure/closet/secure_closet/explorer/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else @@ -127,7 +127,7 @@ /obj/item/cell/device, /obj/item/radio) -/obj/structure/closet/secure_closet/pilot/Initialize() +/obj/structure/closet/secure_closet/pilot/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else diff --git a/modular_chomp/maps/relic_base/structures/closets/security.dm b/modular_chomp/maps/relic_base/structures/closets/security.dm index faa07d8857..ae59c57990 100644 --- a/modular_chomp/maps/relic_base/structures/closets/security.dm +++ b/modular_chomp/maps/relic_base/structures/closets/security.dm @@ -22,7 +22,7 @@ /obj/item/clothing/head/beret/sec/corporate/hos, /obj/item/clothing/mask/gas/half) -/obj/structure/closet/secure_closet/hos_wardrobe/Initialize() +/obj/structure/closet/secure_closet/hos_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else diff --git a/modular_chomp/maps/relic_base/submaps/_relicbase_submaps.dm b/modular_chomp/maps/relic_base/submaps/_relicbase_submaps.dm index c886cf7f8d..dc7319eea8 100644 --- a/modular_chomp/maps/relic_base/submaps/_relicbase_submaps.dm +++ b/modular_chomp/maps/relic_base/submaps/_relicbase_submaps.dm @@ -322,7 +322,7 @@ /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each affect_ghosts = 1 -/obj/effect/step_trigger/zlevel_fall/Initialize() +/obj/effect/step_trigger/zlevel_fall/Initialize(mapload) . = ..() if(istype(get_turf(src), /turf/simulated/floor)) @@ -396,7 +396,7 @@ var/mob/living/simple_mob/my_mob var/depleted = FALSE -/obj/sc_away_spawner/Initialize() +/obj/sc_away_spawner/Initialize(mapload) . = ..() if(!LAZYLEN(mobs_to_pick_from)) diff --git a/modular_chomp/maps/relic_base/turfs/outdoors.dm b/modular_chomp/maps/relic_base/turfs/outdoors.dm index 1e60c30acd..bfc0543730 100644 --- a/modular_chomp/maps/relic_base/turfs/outdoors.dm +++ b/modular_chomp/maps/relic_base/turfs/outdoors.dm @@ -332,7 +332,7 @@ #if defined(Z_LEVEL_SURFACE_MINES) || defined(Z_LEVEL_UNDERMINES) //Dealing with having mining POIs spawn on different Z levels -/turf/simulated/mineral/Initialize() +/turf/simulated/mineral/Initialize(mapload) . = ..() if(istype(src, /turf/simulated/mineral/thor) || istype(src, /turf/simulated/mineral/sif) || istype(src, /turf/simulated/mineral/floor/sif) || istype(src, /turf/simulated/mineral/ignore_mapgen/sif) || istype(src, /turf/simulated/mineral/floor/ignore_mapgen/sif)) return diff --git a/modular_chomp/maps/soluna_nexus/overmap/sectors_sn.dm b/modular_chomp/maps/soluna_nexus/overmap/sectors_sn.dm index b087100de5..9aa4ff0ab4 100644 --- a/modular_chomp/maps/soluna_nexus/overmap/sectors_sn.dm +++ b/modular_chomp/maps/soluna_nexus/overmap/sectors_sn.dm @@ -86,6 +86,6 @@ else if(istype(AM, /obj/effect/overmap/visitable/ship)) atc.msg(message) -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) . = ..() docking_codes = null diff --git a/modular_chomp/maps/southern_cross/overmap/planets/kara/kara.dm b/modular_chomp/maps/southern_cross/overmap/planets/kara/kara.dm index c770476c49..e92717dcb4 100644 --- a/modular_chomp/maps/southern_cross/overmap/planets/kara/kara.dm +++ b/modular_chomp/maps/southern_cross/overmap/planets/kara/kara.dm @@ -51,7 +51,7 @@ tmp.pixel_y = skybox_offset_y return tmp -/obj/effect/overmap/visitable/planet/kara/Initialize() +/obj/effect/overmap/visitable/planet/kara/Initialize(mapload) atmosphere = new(CELL_VOLUME) // Necessary for the planet overmap icon to generate properly, but gas type does not seem to matter. atmosphere.adjust_gas_temp(GAS_CO2, KARA_MOL_CO2, KARA_AVG_TEMP) atmosphere.adjust_gas_temp(GAS_N2, KARA_MOL_N2, KARA_AVG_TEMP) diff --git a/modular_chomp/maps/southern_cross/overmap/planets/kara/kara_OM_only.dm b/modular_chomp/maps/southern_cross/overmap/planets/kara/kara_OM_only.dm index a47395c104..7a92a09e26 100644 --- a/modular_chomp/maps/southern_cross/overmap/planets/kara/kara_OM_only.dm +++ b/modular_chomp/maps/southern_cross/overmap/planets/kara/kara_OM_only.dm @@ -47,7 +47,7 @@ tmp.pixel_y = skybox_offset_y return tmp -/obj/effect/overmap/visitable/planet/kara/Initialize() +/obj/effect/overmap/visitable/planet/kara/Initialize(mapload) atmosphere = new(CELL_VOLUME) // Necessary for the planet overmap icon to generate properly, but gas type does not seem to matter. atmosphere.adjust_gas_temp(GAS_CO2, KARA_MOL_CO2, KARA_AVG_TEMP) atmosphere.adjust_gas_temp(GAS_N2, KARA_MOL_N2, KARA_AVG_TEMP) diff --git a/modular_chomp/maps/southern_cross/overmap/planets/thor/thor.dm b/modular_chomp/maps/southern_cross/overmap/planets/thor/thor.dm index 55797a55b9..222612953f 100644 --- a/modular_chomp/maps/southern_cross/overmap/planets/thor/thor.dm +++ b/modular_chomp/maps/southern_cross/overmap/planets/thor/thor.dm @@ -50,7 +50,7 @@ tmp.pixel_y = skybox_offset_y return tmp -/obj/effect/overmap/visitable/planet/thor/Initialize() +/obj/effect/overmap/visitable/planet/thor/Initialize(mapload) atmosphere = new(CELL_VOLUME) // Necessary for the planet overmap icon to generate properly, but gas type does not seem to matter. atmosphere.adjust_gas_temp(GAS_CO2, THOR_MOL_CO2, THOR_AVG_TEMP) atmosphere.adjust_gas_temp(GAS_N2, THOR_MOL_N2, THOR_AVG_TEMP) @@ -275,17 +275,17 @@ nitrogen = THOR_MOL_N2 temperature = THOR_AVG_TEMP -/turf/simulated/floor/outdoors/grass/thor/Initialize() +/turf/simulated/floor/outdoors/grass/thor/Initialize(mapload) if(tree_chance && prob(tree_chance) && !check_density()) new /obj/structure/flora/tree/jungle(src) . = ..() -/turf/simulated/floor/outdoors/grass/heavy/thor/Initialize() +/turf/simulated/floor/outdoors/grass/heavy/thor/Initialize(mapload) if(tree_chance && prob(tree_chance) && !check_density()) new /obj/structure/flora/tree/jungle(src) . = ..() -/turf/simulated/floor/outdoors/grass/forest/thor/Initialize() +/turf/simulated/floor/outdoors/grass/forest/thor/Initialize(mapload) if(tree_chance && prob(tree_chance) && !check_density()) new /obj/structure/flora/tree/jungle(src) diff --git a/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dm b/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dm index 447042426e..639a272e6e 100644 --- a/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dm +++ b/modular_chomp/maps/southern_cross/overmap/planets/tyr/tyr.dm @@ -45,7 +45,7 @@ tmp.pixel_y = skybox_offset_y return tmp -/obj/effect/overmap/visitable/planet/tyr/Initialize() +/obj/effect/overmap/visitable/planet/tyr/Initialize(mapload) atmosphere = new(CELL_VOLUME) // Necessary for the planet overmap icon to generate properly, but gas type does not seem to matter. atmosphere.adjust_gas_temp(GAS_CO2, TYR_MOL_CO2, TYR_AVG_TEMP) atmosphere.adjust_gas_temp(GAS_N2, TYR_MOL_N2, TYR_AVG_TEMP) diff --git a/modular_chomp/maps/southern_cross/overmap/sectors_sc.dm b/modular_chomp/maps/southern_cross/overmap/sectors_sc.dm index 29c58a1b96..7b9d049d35 100644 --- a/modular_chomp/maps/southern_cross/overmap/sectors_sc.dm +++ b/modular_chomp/maps/southern_cross/overmap/sectors_sc.dm @@ -82,6 +82,6 @@ else if(istype(AM, /obj/effect/overmap/visitable/ship)) atc.msg(message) -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) . = ..() docking_codes = null diff --git a/modular_chomp/maps/southern_cross/overmap/sectors_sif.dm b/modular_chomp/maps/southern_cross/overmap/sectors_sif.dm index 7780e0cb0a..dcaeb864ed 100644 --- a/modular_chomp/maps/southern_cross/overmap/sectors_sif.dm +++ b/modular_chomp/maps/southern_cross/overmap/sectors_sif.dm @@ -31,14 +31,14 @@ icecaps = "icecaps" icon_state = "frozen" //CHOMP comment: Not sure what this does at the moment, but we're doing it live. -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) atmosphere = new(CELL_VOLUME) atmosphere.adjust_gas_temp(GAS_O2, MOLES_O2STANDARD, 273) atmosphere.adjust_gas_temp(GAS_N2, MOLES_N2STANDARD, 273) . = ..() -/obj/effect/overmap/visitable/planet/Sif/Initialize() +/obj/effect/overmap/visitable/planet/Sif/Initialize(mapload) . = ..() docking_codes = null diff --git a/modular_chomp/maps/southern_cross/shuttles/crew_shuttles_ch.dm b/modular_chomp/maps/southern_cross/shuttles/crew_shuttles_ch.dm index 2d5d7385e4..83065704a4 100644 --- a/modular_chomp/maps/southern_cross/shuttles/crew_shuttles_ch.dm +++ b/modular_chomp/maps/southern_cross/shuttles/crew_shuttles_ch.dm @@ -114,8 +114,8 @@ GLOBAL_LIST_EMPTY(shuttdisp_list) . = ..() . += "[shuttle_tag] is currently [location_desc]." -/obj/machinery/status_display/shuttle_display/Initialize() - ..() +/obj/machinery/status_display/shuttle_display/Initialize(mapload) + . = ..() GLOB.shuttdisp_list |= src //Populates the global list for the roundstart hook. /hook/roundstart/proc/shuttdisp_connect() //Initialize (and LateInitialize) call before the shuttle datums exist so this is needed to make shuttle displays work when mapped in @@ -176,4 +176,4 @@ GLOBAL_LIST_EMPTY(shuttdisp_list) return /obj/machinery/status_display/shuttle_display/on_alert_changed() //Same as above but for alert levels. - return \ No newline at end of file + return diff --git a/modular_chomp/maps/southern_cross/southern_cross_overrides.dm b/modular_chomp/maps/southern_cross/southern_cross_overrides.dm index 0ca6a30673..47c17d9788 100644 --- a/modular_chomp/maps/southern_cross/southern_cross_overrides.dm +++ b/modular_chomp/maps/southern_cross/southern_cross_overrides.dm @@ -4,7 +4,7 @@ /mob/living/silicon/robot/platform/cargo req_access = list(access_cargo_bot) -/obj/item/card/id/platform/Initialize() +/obj/item/card/id/platform/Initialize(mapload) . = ..() // access |= access_explorer // access |= access_pilot diff --git a/modular_chomp/maps/southern_cross/southern_cross_sif_defines.dm b/modular_chomp/maps/southern_cross/southern_cross_sif_defines.dm index 4ef3730003..5179df2841 100644 --- a/modular_chomp/maps/southern_cross/southern_cross_sif_defines.dm +++ b/modular_chomp/maps/southern_cross/southern_cross_sif_defines.dm @@ -20,37 +20,37 @@ Z_LEVEL_DEATH_VALLEY ) -/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize(mapload) teleport_x = src.x - 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize(mapload) teleport_x = src.x - 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize(mapload) teleport_x = src.x + 4 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize() +/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize(mapload) teleport_x = src.x + 3 teleport_y = src.y teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize() +/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize(mapload) teleport_x = src.x teleport_y = src.y - 4 teleport_z = src.z return ..() -/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize() +/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize(mapload) teleport_x = src.x teleport_y = src.y + 4 teleport_z = src.z diff --git a/modular_chomp/maps/southern_cross/structures/closets/engineering.dm b/modular_chomp/maps/southern_cross/structures/closets/engineering.dm index 30f22f800f..e66c96ff9d 100644 --- a/modular_chomp/maps/southern_cross/structures/closets/engineering.dm +++ b/modular_chomp/maps/southern_cross/structures/closets/engineering.dm @@ -22,7 +22,7 @@ /obj/item/taperoll/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering) -/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize() +/obj/structure/closet/secure_closet/engineering_chief_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/industrial else diff --git a/modular_chomp/maps/southern_cross/structures/closets/medical.dm b/modular_chomp/maps/southern_cross/structures/closets/medical.dm index 5af03b5151..3c5a9c5634 100644 --- a/modular_chomp/maps/southern_cross/structures/closets/medical.dm +++ b/modular_chomp/maps/southern_cross/structures/closets/medical.dm @@ -21,7 +21,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/shoes/white) -/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize() +/obj/structure/closet/secure_closet/CMO_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/medic else diff --git a/modular_chomp/maps/southern_cross/structures/closets/misc.dm b/modular_chomp/maps/southern_cross/structures/closets/misc.dm index 3efb8d34c7..32afda29ef 100644 --- a/modular_chomp/maps/southern_cross/structures/closets/misc.dm +++ b/modular_chomp/maps/southern_cross/structures/closets/misc.dm @@ -16,7 +16,7 @@ /obj/item/ammo_magazine/clip/c762/hunter = 9, /obj/item/gun/projectile/shotgun/pump/rifle = 2) -/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize() +/obj/structure/closet/secure_closet/guncabinet/rifle/Initialize(mapload) if(prob(85)) starts_with += /obj/item/gun/projectile/shotgun/pump/rifle else @@ -61,7 +61,7 @@ /obj/item/cataloguer ) -/obj/structure/closet/secure_closet/explorer/Initialize() +/obj/structure/closet/secure_closet/explorer/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else @@ -130,7 +130,7 @@ /obj/item/cell/device, /obj/item/radio) -/obj/structure/closet/secure_closet/pilot/Initialize() +/obj/structure/closet/secure_closet/pilot/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack else diff --git a/modular_chomp/maps/southern_cross/structures/closets/security.dm b/modular_chomp/maps/southern_cross/structures/closets/security.dm index 766b9ee520..9d0d8c31c1 100644 --- a/modular_chomp/maps/southern_cross/structures/closets/security.dm +++ b/modular_chomp/maps/southern_cross/structures/closets/security.dm @@ -25,7 +25,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos, /obj/item/clothing/mask/gas/half) -/obj/structure/closet/secure_closet/hos_wardrobe/Initialize() +/obj/structure/closet/secure_closet/hos_wardrobe/Initialize(mapload) if(prob(50)) starts_with += /obj/item/storage/backpack/security else diff --git a/modular_chomp/maps/southern_cross/submaps/_southern_cross_submaps.dm b/modular_chomp/maps/southern_cross/submaps/_southern_cross_submaps.dm index 076000f1f4..7402a826ba 100644 --- a/modular_chomp/maps/southern_cross/submaps/_southern_cross_submaps.dm +++ b/modular_chomp/maps/southern_cross/submaps/_southern_cross_submaps.dm @@ -161,7 +161,7 @@ /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each affect_ghosts = 1 -/obj/effect/step_trigger/zlevel_fall/Initialize() +/obj/effect/step_trigger/zlevel_fall/Initialize(mapload) . = ..() if(istype(get_turf(src), /turf/simulated/floor)) @@ -235,7 +235,7 @@ var/mob/living/simple_mob/my_mob var/depleted = FALSE -/obj/sc_away_spawner/Initialize() +/obj/sc_away_spawner/Initialize(mapload) . = ..() if(!LAZYLEN(mobs_to_pick_from)) diff --git a/modular_chomp/maps/submaps/engine_submaps/engine.dm b/modular_chomp/maps/submaps/engine_submaps/engine.dm index faf12a7a86..9daea64a29 100644 --- a/modular_chomp/maps/submaps/engine_submaps/engine.dm +++ b/modular_chomp/maps/submaps/engine_submaps/engine.dm @@ -6,7 +6,7 @@ /obj/effect/landmark/engine_loader/New() INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader) -/obj/effect/landmark/engine_loader/Initialize() +/obj/effect/landmark/engine_loader/Initialize(mapload) if(SSmapping.engine_loader) warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]") delete_me = TRUE diff --git a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm index 142e4dad44..92279392af 100644 --- a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm +++ b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm @@ -140,7 +140,7 @@ icon = 'icons/turf/desert.dmi' icon_state = "desert" -/turf/unsimulated/floor/beach/sand/desert/Initialize() +/turf/unsimulated/floor/beach/sand/desert/Initialize(mapload) . = ..() if(prob(5)) icon_state = "desert[rand(0,4)]" @@ -159,7 +159,7 @@ icon_state = "seadeep" movement_cost = 8 // Deep water should be difficult to wade through. -/turf/unsimulated/floor/beach/water/Initialize() +/turf/unsimulated/floor/beach/water/Initialize(mapload) . = ..() add_overlay(image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1)) diff --git a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_tiles.dm b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_tiles.dm index cf4b4fbd51..70326c14e9 100644 --- a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_tiles.dm +++ b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_tiles.dm @@ -447,7 +447,7 @@ /turf/unsimulated/floor/tiled/eris/steel/bar_light icon_state = "bar_light" -/turf/unsimulated/floor/tiled/eris/steel/bar_light/Initialize() +/turf/unsimulated/floor/tiled/eris/steel/bar_light/Initialize(mapload) . = ..() set_light(3,4,"#00AAFF") diff --git a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_walls.dm b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_walls.dm index 87c9b102eb..a143362490 100644 --- a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_walls.dm +++ b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_walls.dm @@ -72,7 +72,7 @@ icon = 'icons/goonstation/featherzone.dmi' icon_state = "flockwall0" -/turf/unsimulated/shuttle/wall/flock/Initialize() +/turf/unsimulated/shuttle/wall/flock/Initialize(mapload) . = ..() set_light(3,3,"#26c5a9") diff --git a/tools/ci/validate_files.sh b/tools/ci/validate_files.sh index 45b8152912..d759f87e16 100755 --- a/tools/ci/validate_files.sh +++ b/tools/ci/validate_files.sh @@ -128,6 +128,12 @@ fi if [ "$pcre2_support" -eq 1 ]; then section "regexes requiring PCRE2" + part "improper atom initialize args" + if $grep -P '^/(obj|mob|turf|area|atom)/.+/Initialize\((?!mapload).*\)' $code_files; then + echo + echo -e "${RED}ERROR: Initialize override without 'mapload' argument.${NC}" + FAILED=1 + fi; part "tag" #Checking for 'tag' set to something on maps (! $grep -Pn '( |\t|;|{)tag( ?)=' $map_files)