diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index abb920c547e..a464a5ee9ca 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -82,7 +82,7 @@ appearance_flags = PLANE_MASTER //should use client color blend_mode = BLEND_OVERLAY -/atom/movable/screen/plane_master/game_world_fov_hidden/Initialize() +/atom/movable/screen/plane_master/game_world_fov_hidden/Initialize(mapload) . = ..() add_filter("vision_cone", 1, alpha_mask_filter(render_source = FIELD_OF_VISION_BLOCKER_RENDER_TARGET, flags = MASK_INVERSE)) diff --git a/code/game/machinery/computer/atmos_computers/meters.dm b/code/game/machinery/computer/atmos_computers/meters.dm index 59100c9478d..226335fcbcf 100644 --- a/code/game/machinery/computer/atmos_computers/meters.dm +++ b/code/game/machinery/computer/atmos_computers/meters.dm @@ -5,7 +5,7 @@ var/frequency = FREQ_ATMOS_STORAGE var/datum/radio_frequency/radio_connection -/obj/machinery/meter/monitored/Initialize() +/obj/machinery/meter/monitored/Initialize(mapload) id_tag = chamber_id + "_sensor" radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) return ..() @@ -31,7 +31,7 @@ . = ..() if(!radio_connection) return - + var/datum/signal/signal = new(list( "tag" = id_tag, "device" = "AM", diff --git a/code/game/objects/items/devices/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm index a5b634fe61a..b2669b12575 100644 --- a/code/game/objects/items/devices/portable_chem_mixer.dm +++ b/code/game/objects/items/devices/portable_chem_mixer.dm @@ -18,7 +18,7 @@ ///If the UI has the pH meter shown var/show_ph = TRUE -/obj/item/storage/portable_chem_mixer/Initialize() +/obj/item/storage/portable_chem_mixer/Initialize(mapload) . = ..() atom_storage.max_total_storage = 200 atom_storage.max_slots = 50 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 324818c0e65..e02f44830e9 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -547,6 +547,6 @@ /obj/item/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag. dog_fashion = /datum/dog_fashion/back -/obj/item/radio/off/Initialize() +/obj/item/radio/off/Initialize(mapload) . = ..() set_listening(FALSE) diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index 70d0f9ca2f7..08ad98115cd 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -270,7 +270,7 @@ worn_icon_state = "mailbag" resistance_flags = FLAMMABLE -/obj/item/storage/bag/mail/Initialize() +/obj/item/storage/bag/mail/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 42 diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm index 5412cb505ac..4576e309c87 100644 --- a/code/game/objects/items/puzzle_pieces.dm +++ b/code/game/objects/items/puzzle_pieces.dm @@ -189,7 +189,7 @@ /// Banned combinations of the list in decimal var/static/list/banned_combinations = list(-1, 47, 95, 203, 311, 325, 422, 473, 488, 500, 511) -/obj/structure/light_puzzle/Initialize() +/obj/structure/light_puzzle/Initialize(mapload) . = ..() var/generated_board = -1 while(generated_board in banned_combinations) diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 0083a6abd94..1438484971f 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -31,7 +31,7 @@ /// How much damage to do wielded var/force_wielded = 18 -/obj/item/spear/Initialize() +/obj/item/spear/Initialize(mapload) . = ..() force = force_unwielded diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 0eb818a5836..80672b43d85 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -21,7 +21,7 @@ resistance_flags = NONE max_integrity = 300 -/obj/item/storage/backpack/Initialize() +/obj/item/storage/backpack/Initialize(mapload) . = ..() create_storage(max_slots = 21, max_total_storage = 21) @@ -29,7 +29,7 @@ * Backpack Types */ -/obj/item/storage/backpack/old/Initialize() +/obj/item/storage/backpack/old/Initialize(mapload) . = ..() atom_storage.max_total_storage = 12 @@ -54,7 +54,7 @@ item_flags = NO_MAT_REDEMPTION armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 60, ACID = 50) -/obj/item/storage/backpack/holding/Initialize() +/obj/item/storage/backpack/holding/Initialize(mapload) . = ..() create_storage(max_specific_storage = WEIGHT_CLASS_GIGANTIC, max_total_storage = 35, max_slots = 30, type = /datum/storage/bag_of_holding) atom_storage.allow_big_nesting = TRUE @@ -78,7 +78,7 @@ . = ..() regenerate_presents() -/obj/item/storage/backpack/santabag/Initialize() +/obj/item/storage/backpack/santabag/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 60 @@ -365,7 +365,7 @@ //slowdown = 1 //ORIGINAL slowdown = 0.5 //SKYRAT EDIT CHANGE -/obj/item/storage/backpack/duffelbag/Initialize() +/obj/item/storage/backpack/duffelbag/Initialize(mapload) . = ..() atom_storage.max_total_storage = 30 @@ -521,7 +521,7 @@ special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "This duffel bag has the Syndicate logo stiched on the inside. It appears to be made from lighter yet sturdier materials." // Skyrat edit -/obj/item/storage/backpack/duffelbag/syndie/Initialize() +/obj/item/storage/backpack/duffelbag/syndie/Initialize(mapload) . = ..() atom_storage.silent = TRUE @@ -677,7 +677,7 @@ new /obj/item/grenade/syndieminibomb(src) // For ClownOps. -/obj/item/storage/backpack/duffelbag/clown/syndie/Initialize() +/obj/item/storage/backpack/duffelbag/clown/syndie/Initialize(mapload) . = ..() slowdown = 0 atom_storage.silent = TRUE diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index bfc495318a3..7c8e85a2c3c 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -20,7 +20,7 @@ slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/bag/Initialize() +/obj/item/storage/bag/Initialize(mapload) . = ..() atom_storage.allow_quick_gather = TRUE atom_storage.allow_quick_empty = TRUE @@ -41,7 +41,7 @@ ///If true, can be inserted into the janitor cart var/insertable = TRUE -/obj/item/storage/bag/trash/Initialize() +/obj/item/storage/bag/trash/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.max_total_storage = 30 @@ -84,7 +84,7 @@ inhand_icon_state = "bluetrashbag" item_flags = NO_MAT_REDEMPTION -/obj/item/storage/bag/trash/bluespace/Initialize() +/obj/item/storage/bag/trash/bluespace/Initialize(mapload) . = ..() atom_storage.max_total_storage = 60 atom_storage.max_slots = 60 @@ -111,7 +111,7 @@ . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_HUGE atom_storage.max_total_storage = 50 - atom_storage.numerical_stacking = TRUE + atom_storage.numerical_stacking = TRUE atom_storage.allow_quick_empty = TRUE atom_storage.allow_quick_gather = TRUE atom_storage.set_holdable(list(/obj/item/stack/ore)) @@ -178,7 +178,7 @@ desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures." icon_state = "satchel_bspace" -/obj/item/storage/bag/ore/holding/Initialize() +/obj/item/storage/bag/ore/holding/Initialize(mapload) . = ..() atom_storage.max_slots = INFINITY atom_storage.max_specific_storage = INFINITY @@ -195,7 +195,7 @@ worn_icon_state = "plantbag" resistance_flags = FLAMMABLE -/obj/item/storage/bag/plants/Initialize() +/obj/item/storage/bag/plants/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 100 @@ -253,7 +253,7 @@ var/capacity = 300; //the number of sheets it can carry. -/obj/item/storage/bag/sheetsnatcher/Initialize() +/obj/item/storage/bag/sheetsnatcher/Initialize(mapload) . = ..() atom_storage.allow_quick_empty = TRUE atom_storage.allow_quick_gather = TRUE @@ -288,7 +288,7 @@ worn_icon_state = "bookbag" resistance_flags = FLAMMABLE -/obj/item/storage/bag/books/Initialize() +/obj/item/storage/bag/books/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 21 @@ -317,7 +317,7 @@ custom_materials = list(/datum/material/iron=3000) custom_price = PAYCHECK_CREW * 0.6 -/obj/item/storage/bag/tray/Initialize() +/obj/item/storage/bag/tray/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY //Plates are required bulky to keep them out of backpacks atom_storage.set_holdable(list( @@ -404,7 +404,7 @@ desc = "A bag for storing pills, patches, and bottles." resistance_flags = FLAMMABLE -/obj/item/storage/bag/chemistry/Initialize() +/obj/item/storage/bag/chemistry/Initialize(mapload) . = ..() atom_storage.max_total_storage = 200 atom_storage.max_slots = 50 @@ -431,7 +431,7 @@ desc = "A bag for the safe transportation and disposal of biowaste and other virulent materials." resistance_flags = FLAMMABLE -/obj/item/storage/bag/bio/Initialize() +/obj/item/storage/bag/bio/Initialize(mapload) . = ..() atom_storage.max_total_storage = 200 atom_storage.max_slots = 25 @@ -460,7 +460,7 @@ desc = "A bag for the storage and transport of anomalous materials." resistance_flags = FLAMMABLE -/obj/item/storage/bag/xeno/Initialize() +/obj/item/storage/bag/xeno/Initialize(mapload) . = ..() atom_storage.max_total_storage = 200 atom_storage.max_slots = 25 @@ -491,7 +491,7 @@ slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS resistance_flags = FLAMMABLE -/obj/item/storage/bag/construction/Initialize() +/obj/item/storage/bag/construction/Initialize(mapload) . = ..() atom_storage.max_total_storage = 100 atom_storage.max_slots = 50 @@ -514,7 +514,7 @@ inhand_icon_state = "quiver" worn_icon_state = "harpoon_quiver" -/obj/item/storage/bag/harpoon_quiver/Initialize() +/obj/item/storage/bag/harpoon_quiver/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_TINY atom_storage.max_slots = 40 diff --git a/code/game/objects/items/storage/basket.dm b/code/game/objects/items/storage/basket.dm index 73904d99ab6..1ea766822f8 100644 --- a/code/game/objects/items/storage/basket.dm +++ b/code/game/objects/items/storage/basket.dm @@ -5,7 +5,7 @@ w_class = WEIGHT_CLASS_BULKY resistance_flags = FLAMMABLE -/obj/item/storage/basket/Initialize() +/obj/item/storage/basket/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 21 diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index df557d4d590..de239aeed25 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -41,7 +41,7 @@ drop_sound = 'sound/items/handling/toolbelt_drop.ogg' pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg' -/obj/item/storage/belt/utility/Initialize() +/obj/item/storage/belt/utility/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 21 @@ -205,7 +205,7 @@ inhand_icon_state = "medical" worn_icon_state = "medical" -/obj/item/storage/belt/medical/Initialize() +/obj/item/storage/belt/medical/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 21 @@ -339,7 +339,7 @@ ) // SKYRAT EDIT ADDITION END -/obj/item/storage/belt/security/Initialize() +/obj/item/storage/belt/security/Initialize(mapload) . = ..() atom_storage.max_slots = 5 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -380,7 +380,7 @@ content_overlays = FALSE custom_premium_price = PAYCHECK_COMMAND * 3 -/obj/item/storage/belt/security/webbing/Initialize() +/obj/item/storage/belt/security/webbing/Initialize(mapload) . = ..() atom_storage.max_slots = 6 @@ -392,7 +392,7 @@ worn_icon_state = "explorer1" w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/belt/mining/Initialize() +/obj/item/storage/belt/mining/Initialize(mapload) . = ..() atom_storage.max_slots = 6 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -453,7 +453,7 @@ inhand_icon_state = "ebelt" worn_icon_state = "ebelt" -/obj/item/storage/belt/mining/primitive/Initialize() +/obj/item/storage/belt/mining/primitive/Initialize(mapload) . = ..() atom_storage.max_slots = 5 @@ -464,7 +464,7 @@ inhand_icon_state = "soulstonebelt" worn_icon_state = "soulstonebelt" -/obj/item/storage/belt/soulstone/Initialize() +/obj/item/storage/belt/soulstone/Initialize(mapload) . = ..() atom_storage.max_slots = 6 atom_storage.set_holdable(list( @@ -487,7 +487,7 @@ worn_icon_state = "championbelt" custom_materials = list(/datum/material/gold=400) -/obj/item/storage/belt/champion/Initialize() +/obj/item/storage/belt/champion/Initialize(mapload) . = ..() atom_storage.max_slots = 1 atom_storage.set_holdable(list( @@ -509,7 +509,7 @@ worn_icon_state = "militarywebbing" resistance_flags = FIRE_PROOF -/obj/item/storage/belt/military/Initialize() +/obj/item/storage/belt/military/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL @@ -521,7 +521,7 @@ var/sponsor = pick("Donk Co.", "Waffle Co.", "Roffle Co.", "Gorlax Marauders", "Tiger Cooperative") desc = "A set of snack-tical webbing worn by athletes of the [sponsor] VR sports division." -/obj/item/storage/belt/military/snack/Initialize() +/obj/item/storage/belt/military/snack/Initialize(mapload) . = ..() atom_storage.max_slots = 6 atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL @@ -591,7 +591,7 @@ inhand_icon_state = "security" worn_icon_state = "assault" -/obj/item/storage/belt/military/assault/Initialize() +/obj/item/storage/belt/military/assault/Initialize(mapload) . = ..() atom_storage.max_slots = 6 @@ -608,7 +608,7 @@ inhand_icon_state = "security" worn_icon_state = "grenadebeltnew" -/obj/item/storage/belt/grenade/Initialize() +/obj/item/storage/belt/grenade/Initialize(mapload) . = ..() atom_storage.max_slots = 30 atom_storage.numerical_stacking = TRUE @@ -647,7 +647,7 @@ inhand_icon_state = "soulstonebelt" worn_icon_state = "soulstonebelt" -/obj/item/storage/belt/wands/Initialize() +/obj/item/storage/belt/wands/Initialize(mapload) . = ..() atom_storage.max_slots = 6 atom_storage.set_holdable(list( @@ -673,7 +673,7 @@ inhand_icon_state = "janibelt" worn_icon_state = "janibelt" -/obj/item/storage/belt/janitor/Initialize() +/obj/item/storage/belt/janitor/Initialize(mapload) . = ..() atom_storage.max_slots = 6 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL // Set to this so the light replacer can fit. @@ -711,7 +711,7 @@ inhand_icon_state = "bandolier" worn_icon_state = "bandolier" -/obj/item/storage/belt/bandolier/Initialize() +/obj/item/storage/belt/bandolier/Initialize(mapload) . = ..() atom_storage.max_slots = 18 atom_storage.max_total_storage = 18 @@ -730,7 +730,7 @@ dying_key = DYE_REGISTRY_FANNYPACK custom_price = PAYCHECK_CREW * 2 -/obj/item/storage/belt/fannypack/Initialize() +/obj/item/storage/belt/fannypack/Initialize(mapload) . = ..() atom_storage.max_slots = 3 atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL @@ -803,7 +803,7 @@ worn_icon_state = "sheath" w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/belt/sabre/Initialize() +/obj/item/storage/belt/sabre/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) @@ -852,7 +852,7 @@ worn_icon_state = "plantbelt" content_overlays = TRUE -/obj/item/storage/belt/plant/Initialize() +/obj/item/storage/belt/plant/Initialize(mapload) . = ..() atom_storage.max_slots = 6 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index dcdc78f00c7..f0f80ed08d5 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -10,7 +10,7 @@ resistance_flags = FLAMMABLE var/title = "book" -/obj/item/storage/book/Initialize() +/obj/item/storage/book/Initialize(mapload) . = ..() atom_storage.max_slots = 1 diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 004876ecc27..021cb389e5a 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -480,7 +480,7 @@ for(var/i in 1 to 6) new donktype(src) -/obj/item/storage/box/donkpockets/Initialize() +/obj/item/storage/box/donkpockets/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/food/donkpocket)) @@ -521,7 +521,7 @@ illustration = null var/cube_type = /obj/item/food/monkeycube -/obj/item/storage/box/monkeycubes/Initialize() +/obj/item/storage/box/monkeycubes/Initialize(mapload) . = ..() atom_storage.max_slots = 7 atom_storage.set_holdable(list(/obj/item/food/monkeycube)) @@ -540,7 +540,7 @@ icon_state = "monkeycubebox" illustration = null -/obj/item/storage/box/gorillacubes/Initialize() +/obj/item/storage/box/gorillacubes/Initialize(mapload) . = ..() atom_storage.max_slots = 3 atom_storage.set_holdable(list(/obj/item/food/monkeycube)) @@ -697,7 +697,7 @@ icon_state = "spbox" illustration = "" -/obj/item/storage/box/snappops/Initialize() +/obj/item/storage/box/snappops/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/toy/snappop)) atom_storage.max_slots = 8 @@ -721,7 +721,7 @@ base_icon_state = "matchbox" illustration = null -/obj/item/storage/box/matches/Initialize() +/obj/item/storage/box/matches/Initialize(mapload) . = ..() atom_storage.max_slots = 10 atom_storage.set_holdable(list(/obj/item/match)) @@ -756,7 +756,7 @@ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' foldable = /obj/item/stack/sheet/cardboard //BubbleWrap -/obj/item/storage/box/lights/Initialize() +/obj/item/storage/box/lights/Initialize(mapload) . = ..() atom_storage.max_slots = 21 atom_storage.set_holdable(list(/obj/item/light/tube, /obj/item/light/bulb)) @@ -1258,7 +1258,7 @@ foldable = null custom_price = PAYCHECK_CREW -/obj/item/storage/box/gum/Initialize() +/obj/item/storage/box/gum/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/food/bubblegum)) atom_storage.max_slots = 4 diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 1edca978656..63188876bc0 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -16,7 +16,7 @@ max_integrity = 150 var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New() -/obj/item/storage/briefcase/Initialize() +/obj/item/storage/briefcase/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 21 @@ -70,4 +70,3 @@ new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) new /obj/item/suppressor/specialoffer(src) - diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index aa6f9226a60..433368f935c 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -29,7 +29,7 @@ /// What this container folds up into when it's empty. var/obj/fold_result = /obj/item/stack/sheet/cardboard -/obj/item/storage/fancy/Initialize() +/obj/item/storage/fancy/Initialize(mapload) . = ..() atom_storage.max_slots = spawn_count @@ -93,7 +93,7 @@ custom_premium_price = PAYCHECK_COMMAND * 1.75 contents_tag = "donut" -/obj/item/storage/fancy/donut_box/Initialize() +/obj/item/storage/fancy/donut_box/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/food/donut)) @@ -140,7 +140,7 @@ spawn_count = 12 contents_tag = "egg" -/obj/item/storage/fancy/egg_box/Initialize() +/obj/item/storage/fancy/egg_box/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/food/egg)) @@ -213,7 +213,7 @@ atom_storage.max_slots = 0 return -/obj/item/storage/fancy/cigarettes/Initialize() +/obj/item/storage/fancy/cigarettes/Initialize(mapload) . = ..() atom_storage.quickdraw = TRUE atom_storage.set_holdable(list(/obj/item/clothing/mask/cigarette, /obj/item/lighter)) @@ -359,7 +359,7 @@ spawn_count = 10 custom_price = PAYCHECK_LOWER -/obj/item/storage/fancy/rollingpapers/Initialize() +/obj/item/storage/fancy/rollingpapers/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/rollingpaper)) @@ -390,7 +390,7 @@ spawn_coupon = FALSE display_cigs = FALSE -/obj/item/storage/fancy/cigarettes/cigars/Initialize() +/obj/item/storage/fancy/cigarettes/cigars/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/clothing/mask/cigarette/cigar)) @@ -439,7 +439,7 @@ spawn_type = /obj/item/food/tinychocolate spawn_count = 8 -/obj/item/storage/fancy/heart_box/Initialize() +/obj/item/storage/fancy/heart_box/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/food/tinychocolate)) @@ -454,6 +454,6 @@ spawn_type = /obj/item/food/nugget spawn_count = 6 -/obj/item/storage/fancy/nugget_box/Initialize() +/obj/item/storage/fancy/nugget_box/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/food/nugget)) diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index f53a3870c9a..c8637fd784f 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -30,7 +30,7 @@ name = "chief engineer's garment bag" desc = "A bag for storing extra clothes and shoes. This one belongs to the chief engineer." -/obj/item/storage/bag/garment/Initialize() +/obj/item/storage/bag/garment/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.numerical_stacking = FALSE @@ -121,4 +121,3 @@ new /obj/item/clothing/neck/cloak/ce(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/suit/hooded/wintercoat/engineering/ce(src) - diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 4b9e1ebacb4..abcf0d4b10d 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -17,7 +17,7 @@ . = ..() REMOVE_TRAIT(user, TRAIT_GUNFLIP, CLOTHING_TRAIT) -/obj/item/storage/belt/holster/Initialize() +/obj/item/storage/belt/holster/Initialize(mapload) . = ..() atom_storage.max_slots = 1 atom_storage.max_total_storage = 16 @@ -35,7 +35,7 @@ name = "thermal shoulder holsters" desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Meant to hold a twinned pair of thermal pistols, but can fit several kinds of energy handguns as well." -/obj/item/storage/belt/holster/thermal/Initialize() +/obj/item/storage/belt/holster/thermal/Initialize(mapload) . = ..() atom_storage.max_slots = 2 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -58,7 +58,7 @@ desc = "A holster able to carry handguns and some ammo. WARNING: Badasses only." w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/belt/holster/detective/Initialize() +/obj/item/storage/belt/holster/detective/Initialize(mapload) . = ..() atom_storage.max_slots = 3 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -117,7 +117,7 @@ chameleon_action.initialize_disguises() add_item_action(chameleon_action) -/obj/item/storage/belt/holster/chameleon/Initialize() +/obj/item/storage/belt/holster/chameleon/Initialize(mapload) . = ..() atom_storage.silent = TRUE @@ -131,7 +131,7 @@ . = ..() chameleon_action.emp_randomise(INFINITY) -/obj/item/storage/belt/holster/chameleon/Initialize() +/obj/item/storage/belt/holster/chameleon/Initialize(mapload) . = ..() atom_storage.max_slots = 2 atom_storage.max_total_storage = WEIGHT_CLASS_NORMAL @@ -161,7 +161,7 @@ worn_icon_state = "syndicate_holster" w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/belt/holster/nukie/Initialize() +/obj/item/storage/belt/holster/nukie/Initialize(mapload) . = ..() atom_storage.max_slots = 2 atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 75bcacdbca2..9cda286decb 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -13,7 +13,7 @@ var/icon_closed = "lockbox" var/icon_broken = "lockbox+b" -/obj/item/storage/lockbox/Initialize() +/obj/item/storage/lockbox/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 14 @@ -96,7 +96,7 @@ icon_closed = "medalbox" icon_broken = "medalbox+b" -/obj/item/storage/lockbox/medal/Initialize() +/obj/item/storage/lockbox/medal/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.max_slots = 10 @@ -245,4 +245,3 @@ privacy_lock = atom_storage.locked user.visible_message(span_notice("[user] [privacy_lock ? "" : "un"]locks [src]'s privacy lock."), span_notice("You [privacy_lock ? "" : "un"]lock [src]'s privacy lock.")) - diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index 57ac7490ce7..ae71eda47b3 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -62,7 +62,7 @@ inhand_icon_state = "medkit" desc = "A high capacity aid kit for doctors, full of medical supplies and basic surgical equipment" -/obj/item/storage/medkit/surgery/Initialize() +/obj/item/storage/medkit/surgery/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL //holds the same equipment as a medibelt atom_storage.max_slots = 12 @@ -264,7 +264,7 @@ icon_state = "medkit_tactical" damagetype_healed = "all" -/obj/item/storage/medkit/tactical/Initialize() +/obj/item/storage/medkit/tactical/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -323,7 +323,7 @@ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_SMALL -/obj/item/storage/pill_bottle/Initialize() +/obj/item/storage/pill_bottle/Initialize(mapload) . = ..() atom_storage.allow_quick_gather = TRUE atom_storage.set_holdable(list(/obj/item/reagent_containers/pill)) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 19e80590145..7d21719fcec 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -33,7 +33,7 @@ var/can_hack_open = TRUE -/obj/item/storage/secure/Initialize() +/obj/item/storage/secure/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.max_total_storage = 14 @@ -143,7 +143,7 @@ new /obj/item/paper(src) new /obj/item/pen(src) -/obj/item/storage/secure/briefcase/Initialize() +/obj/item/storage/secure/briefcase/Initialize(mapload) . = ..() atom_storage.max_total_storage = 21 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -172,7 +172,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/storage/secure/safe, 32) -/obj/item/storage/secure/safe/Initialize() +/obj/item/storage/secure/safe/Initialize(mapload) . = ..() atom_storage.set_holdable(cant_hold_list = list(/obj/item/storage/secure/briefcase)) atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index dd67c5d222a..3a6fc1766c5 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -21,7 +21,7 @@ . = ..() update_appearance() -/obj/item/storage/cans/Initialize() +/obj/item/storage/cans/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.max_total_storage = 12 diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 4755fd38f27..341f45de900 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -38,7 +38,7 @@ if(has_latches) . += latches -/obj/item/storage/toolbox/Initialize() +/obj/item/storage/toolbox/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -101,7 +101,7 @@ force = 5 w_class = WEIGHT_CLASS_NORMAL -/obj/item/storage/toolbox/mechanical/old/heirloom/Initialize() +/obj/item/storage/toolbox/mechanical/old/heirloom/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL @@ -170,7 +170,7 @@ special_desc_requirement = EXAMINE_CHECK_SYNDICATE // Skyrat edit special_desc = "A toolbox manufactured by the Syndicate containing extra tactical tools. Made of more robust materials than the average toolbox." // Skyrat edit -/obj/item/storage/toolbox/syndicate/Initialize() +/obj/item/storage/toolbox/syndicate/Initialize(mapload) . = ..() atom_storage.silent = TRUE @@ -207,7 +207,7 @@ w_class = WEIGHT_CLASS_GIGANTIC //Holds more than a regular toolbox! material_flags = NONE -/obj/item/storage/toolbox/artistic/Initialize() +/obj/item/storage/toolbox/artistic/Initialize(mapload) . = ..() atom_storage.max_total_storage = 20 atom_storage.max_slots = 10 @@ -273,7 +273,7 @@ w_class = WEIGHT_CLASS_NORMAL has_latches = FALSE -/obj/item/storage/toolbox/infiltrator/Initialize() +/obj/item/storage/toolbox/infiltrator/Initialize(mapload) . = ..() atom_storage.max_slots = 10 atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL @@ -340,6 +340,3 @@ /obj/item/storage/toolbox/haunted name = "old toolbox" custom_materials = list(/datum/material/hauntium = 500) - - - diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 171c1c1fbff..8db53e571f0 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -385,7 +385,7 @@ /obj/item/storage/box/syndie_kit/space name = "boxed space suit and helmet" -/obj/item/storage/box/syndie_kit/space/Initialize() +/obj/item/storage/box/syndie_kit/space/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.set_holdable(list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate)) @@ -410,7 +410,7 @@ /obj/item/storage/box/syndie_kit/chemical name = "chemical kit" -/obj/item/storage/box/syndie_kit/chemical/Initialize() +/obj/item/storage/box/syndie_kit/chemical/Initialize(mapload) . = ..() atom_storage.max_slots = 14 diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 53159d6ff86..7eac2e12e8b 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -10,7 +10,7 @@ var/list/combined_access var/cached_flat_icon -/obj/item/storage/wallet/Initialize() +/obj/item/storage/wallet/Initialize(mapload) . = ..() atom_storage.max_slots = 4 atom_storage.set_holdable(list( diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index dcc4b4d17ca..dccd8c3a708 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -73,7 +73,7 @@ throwforce = 10 throw_speed = 2 -/obj/item/crowbar/large/old/Initialize() +/obj/item/crowbar/large/old/Initialize(mapload) . = ..() if(prob(50)) icon_state = "crowbar_powergame" diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 936a14801c8..bfda2e7fb06 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -479,7 +479,7 @@ LINEN BINS icon_state = "random_bedsheet" bedsheet_type = BEDSHEET_ABSTRACT -/obj/item/bedsheet/dorms_double/Initialize() +/obj/item/bedsheet/dorms_double/Initialize(mapload) ..() var/type = pick_weight(list("Colors" = 80, "Special" = 20)) switch(type) diff --git a/code/game/objects/structures/toiletbong.dm b/code/game/objects/structures/toiletbong.dm index c487c373ef9..0c21f500cf4 100644 --- a/code/game/objects/structures/toiletbong.dm +++ b/code/game/objects/structures/toiletbong.dm @@ -9,7 +9,7 @@ var/smokeradius = 1 var/mutable_appearance/weed_overlay -/obj/structure/toiletbong/Initialize() +/obj/structure/toiletbong/Initialize(mapload) . = ..() create_storage() atom_storage.attack_hand_interact = FALSE diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm index a9a7d6656e0..e9fc84b5b40 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(heretic_sacrifice_landmarks) /// What path this landmark is intended for. var/for_heretic_path = PATH_START -/obj/effect/landmark/heretic/Initialize() +/obj/effect/landmark/heretic/Initialize(mapload) . = ..() GLOB.heretic_sacrifice_landmarks[for_heretic_path] = src @@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(heretic_sacrifice_landmarks) /// Light power of the signpost. var/power = 0.8 -/obj/structure/no_effect_signpost/void/Initialize() +/obj/structure/no_effect_signpost/void/Initialize(mapload) . = ..() set_light(range, power) diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm index 36c15cd2141..5726a20cce9 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -401,7 +401,7 @@ custom_premium_price = PAYCHECK_CREW * 1.25 -/obj/item/canvas/thirtysix_twentyfour/Initialize() +/obj/item/canvas/thirtysix_twentyfour/Initialize(mapload) . = ..() AddElement(/datum/element/item_scaling, 1, 0.8) icon = 'icons/obj/artstuff_64x64.dmi' @@ -424,7 +424,7 @@ custom_premium_price = PAYCHECK_CREW * 1.75 -/obj/item/canvas/fortyfive_twentyseven/Initialize() +/obj/item/canvas/fortyfive_twentyseven/Initialize(mapload) . = ..() AddElement(/datum/element/item_scaling, 1, 0.7) icon = 'icons/obj/artstuff_64x64.dmi' @@ -762,7 +762,7 @@ ///Chosen paint color var/current_color = "#000000" -/obj/item/paint_palette/Initialize() +/obj/item/paint_palette/Initialize(mapload) . = ..() AddComponent(/datum/component/palette, AVAILABLE_PALETTE_SPACE, current_color) diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index de3c1010f7e..d529723fed9 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -110,7 +110,7 @@ icon_state = "1" color = rgb(0,0,255) -/obj/structure/ladder/unbreakable/rune/Initialize() +/obj/structure/ladder/unbreakable/rune/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_blocker) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 28f7ecc8dce..583034b9505 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -817,7 +817,7 @@ /// The badmin mode. Makes your projectiles act like the real deal. var/real_hits = FALSE -/obj/item/gun/energy/laser/chameleon/Initialize() +/obj/item/gun/energy/laser/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/gun diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm index 35447d79b51..84281601a12 100644 --- a/code/modules/fishing/fishing_equipment.dm +++ b/code/modules/fishing/fishing_equipment.dm @@ -70,7 +70,7 @@ inhand_icon_state = "artistic_toolbox" material_flags = NONE -/obj/item/storage/toolbox/Initialize() +/obj/item/storage/toolbox/Initialize(mapload) . = ..() // Can hold fishing rod despite the size var/static/list/exception_cache = typecacheof(/obj/item/fishing_rod) diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 48d7b37e67a..f5db89fdfc0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -378,7 +378,7 @@ /obj/machinery/microwave/hell desc = "Cooks and boils stuff. This one appears to be a bit... off." -/obj/machinery/microwave/hell/Initialize() +/obj/machinery/microwave/hell/Initialize(mapload) . = ..() //We want there to be some chance of them getting a working microwave (eventually). if(prob(95)) diff --git a/code/modules/library/book.dm b/code/modules/library/book.dm index 1b0d55abcaa..26febb11b49 100644 --- a/code/modules/library/book.dm +++ b/code/modules/library/book.dm @@ -106,7 +106,7 @@ ///Maximum icon state number var/maximum_book_state = 8 -/obj/item/book/Initialize() +/obj/item/book/Initialize(mapload) . = ..() book_data = new(starting_title, starting_author, starting_content) diff --git a/code/modules/mining/equipment/kheiral_cuffs.dm b/code/modules/mining/equipment/kheiral_cuffs.dm index 8bc57ea2ce9..795dcbb662d 100644 --- a/code/modules/mining/equipment/kheiral_cuffs.dm +++ b/code/modules/mining/equipment/kheiral_cuffs.dm @@ -22,7 +22,7 @@ /// If we're off the station's Z-level var/far_from_home = FALSE -/obj/item/kheiral_cuffs/Initialize() +/obj/item/kheiral_cuffs/Initialize(mapload) . = ..() update_icon(UPDATE_OVERLAYS) RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, .proc/check_z) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drone_tools.dm b/code/modules/mob/living/simple_animal/friendly/drone/drone_tools.dm index d2091f4a524..71fb871d6de 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drone_tools.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drone_tools.dm @@ -6,7 +6,7 @@ item_flags = ABSTRACT resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/item/storage/drone_tools/Initialize() +/obj/item/storage/drone_tools/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) @@ -86,4 +86,3 @@ inhand_icon_state = "cutters" item_flags = NO_MAT_REDEMPTION random_color = FALSE - diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 6739f272612..7158729d56d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -84,7 +84,7 @@ Difficulty: Hard /// Blood warp ability var/datum/action/cooldown/mob_cooldown/blood_warp/blood_warp -/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize() +/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT) triple_charge = new /datum/action/cooldown/mob_cooldown/charge/triple_charge() @@ -330,7 +330,7 @@ Difficulty: Hard true_spawn = FALSE var/move_through_mob -/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Initialize() +/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Initialize(mapload) . = ..() toggle_ai(AI_OFF) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 69212074b1c..e6baa2057ba 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -83,7 +83,7 @@ /// Lava swoop ability var/datum/action/cooldown/mob_cooldown/lava_swoop/lava_swoop -/mob/living/simple_animal/hostile/megafauna/dragon/Initialize() +/mob/living/simple_animal/hostile/megafauna/dragon/Initialize(mapload) . = ..() fire_cone = new /datum/action/cooldown/mob_cooldown/fire_breath/cone() meteors = new /datum/action/cooldown/mob_cooldown/meteors() @@ -359,7 +359,7 @@ butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30) attack_action_types = list() -/mob/living/simple_animal/hostile/megafauna/dragon/lesser/Initialize() +/mob/living/simple_animal/hostile/megafauna/dragon/lesser/Initialize(mapload) . = ..() fire_cone.Remove(src) meteors.Remove(src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm index 8afc4f75887..2f9f1c1fcac 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm @@ -166,7 +166,7 @@ light_power = 3 light_range = 2 -/obj/effect/brimbeam/Initialize() +/obj/effect/brimbeam/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 77cd4f19bd6..b4649a9214c 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -481,7 +481,7 @@ /// Whitelist of attachable hats, read note in Initialize() below this line var/static/list/attachable_hats_list -/obj/item/mod/module/hat_stabilizer/Initialize() +/obj/item/mod/module/hat_stabilizer/Initialize(mapload) . = ..() attachable_hats_list = typecacheof( //List of attachable hats. Make sure these and their subtypes are all tested, so they dont appear janky. @@ -507,7 +507,7 @@ /obj/item/clothing/head/papersack, /obj/item/clothing/head/caphat/beret, )) - + /obj/item/mod/module/hat_stabilizer/on_suit_activation() RegisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE, .proc/add_examine) RegisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY, .proc/place_hat) diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 7ab0ded81f1..2d2d48147e9 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -41,7 +41,7 @@ var/can_customise = TRUE var/default_picture_name -/obj/item/camera/Initialize() +/obj/item/camera/Initialize(mapload) . = ..() AddComponent(/datum/component/shell, list(new /obj/item/circuit_component/camera), SHELL_CAPACITY_SMALL) diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index 6bdc79215b4..8c7371504c5 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -197,7 +197,7 @@ var/portrait_state var/portrait_desc -/obj/structure/sign/picture_frame/portrait/Initialize() +/obj/structure/sign/picture_frame/portrait/Initialize(mapload) . = ..() switch(rand(1,4)) if(1) // Deempisi @@ -265,7 +265,7 @@ del_id_on_destroy = TRUE ///Generates a persistence id unique to the current map. Every bar should feel a little bit different after all. -/obj/structure/sign/picture_frame/portrait/bar/Initialize() +/obj/structure/sign/picture_frame/portrait/bar/Initialize(mapload) if(SSmapping.config.map_path != CUSTOM_MAP_PATH) //skip adminloaded custom maps. persistence_id = "frame_bar_[SSmapping.config.map_name]" return ..() diff --git a/code/modules/projectiles/guns/energy/dueling.dm b/code/modules/projectiles/guns/energy/dueling.dm index 2db258cb89f..bd417e1459f 100644 --- a/code/modules/projectiles/guns/energy/dueling.dm +++ b/code/modules/projectiles/guns/energy/dueling.dm @@ -317,7 +317,7 @@ icon_broken = "medalbox+b" base_icon_state = "medalbox" -/obj/item/storage/lockbox/dueling/Initialize() +/obj/item/storage/lockbox/dueling/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL atom_storage.max_slots = 2 diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 14d03053e6f..30712de4b4b 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -14,7 +14,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good var/pshoom_or_beepboopblorpzingshadashwoosh = 'sound/items/rped.ogg' var/alt_sound = null -/obj/item/storage/part_replacer/Initialize() +/obj/item/storage/part_replacer/Initialize(mapload) . = ..() create_storage(type = /datum/storage/rped) diff --git a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm index 179c1476ca3..29612bbf373 100644 --- a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm +++ b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm @@ -140,7 +140,7 @@ var/praying = FALSE var/deity_name = "Coderbus" // This is the default, hopefully won't actually appear if the religion subsystem is running properly -/obj/item/nullrod/rosary/Initialize() +/obj/item/nullrod/rosary/Initialize(mapload) .=..() if(GLOB.deity) deity_name = GLOB.deity diff --git a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm index d5bac96378d..c0045a514eb 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm @@ -9,7 +9,7 @@ var/polling = FALSE/// if the helmet is currently polling for targets (special code for removal) var/light_colors = 1 /// which icon state color this is (red, blue, yellow) -/obj/item/clothing/head/helmet/monkey_sentience/Initialize() +/obj/item/clothing/head/helmet/monkey_sentience/Initialize(mapload) . = ..() light_colors = rand(1, 3) update_appearance() diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm index b1078f206fa..1a4bc0a1eee 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm @@ -1,4 +1,4 @@ -/obj/item/storage/backpack/snail/Initialize() +/obj/item/storage/backpack/snail/Initialize(mapload) . = ..() atom_storage.max_specific_storage = 30 diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm index d94beb6edea..37df7d08e6e 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bananaspider.dm @@ -42,7 +42,7 @@ juice_results = list(/datum/reagent/consumable/banana = 10) -/obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize() +/obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 20) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm index e46e21dad67..9284b5b58ad 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/bumbles.dm @@ -31,7 +31,7 @@ speak_chance = 1 unique_name = TRUE -/mob/living/simple_animal/pet/bumbles/Initialize() +/mob/living/simple_animal/pet/bumbles/Initialize(mapload) . = ..() AddElement(/datum/element/simple_flying) add_verb(src, /mob/living/proc/toggle_resting) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm index 2d832935cc1..ec270b74670 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm @@ -66,7 +66,7 @@ light_power = 0.8 light_on = FALSE -/mob/living/simple_animal/pet/dog/corgi/borgi/Initialize() +/mob/living/simple_animal/pet/dog/corgi/borgi/Initialize(mapload) . = ..() var/datum/component/overlay_lighting/lighting_object = src.GetComponent(/datum/component/overlay_lighting) var/image/cone = lighting_object.cone diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm index d63d3dc21d4..fb41025aff2 100644 --- a/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/ballistic/automatic.dm @@ -52,7 +52,7 @@ /obj/item/gun/ballistic/automatic/c20r/unrestricted pin = /obj/item/firing_pin -/obj/item/gun/ballistic/automatic/c20r/Initialize() +/obj/item/gun/ballistic/automatic/c20r/Initialize(mapload) . = ..() update_appearance() @@ -122,7 +122,7 @@ fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg' company_flag = COMPANY_SCARBOROUGH -/obj/item/gun/ballistic/automatic/m90/Initialize() +/obj/item/gun/ballistic/automatic/m90/Initialize(mapload) . = ..() underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher(src) update_appearance() @@ -130,7 +130,7 @@ /obj/item/gun/ballistic/automatic/m90/unrestricted pin = /obj/item/firing_pin -/obj/item/gun/ballistic/automatic/m90/unrestricted/Initialize() +/obj/item/gun/ballistic/automatic/m90/unrestricted/Initialize(mapload) . = ..() underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(src) update_appearance() diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm index dd2a71e0b03..9d5927edcf8 100644 --- a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm @@ -98,7 +98,7 @@ else ..() -/obj/item/gun/Initialize() +/obj/item/gun/Initialize(mapload) . = ..() if(pin && !pinless) pin = new pin(src) diff --git a/modular_skyrat/modules/SiliconQoL/code/robotic_factory.dm b/modular_skyrat/modules/SiliconQoL/code/robotic_factory.dm index cd3318dbf65..27a2322316b 100644 --- a/modular_skyrat/modules/SiliconQoL/code/robotic_factory.dm +++ b/modular_skyrat/modules/SiliconQoL/code/robotic_factory.dm @@ -19,7 +19,7 @@ /// The master AI , assigned when placed down with the ability. var/mob/living/silicon/ai/masterAI -/obj/machinery/transformer_rp/Initialize() +/obj/machinery/transformer_rp/Initialize(mapload) // On us . = ..() new /obj/machinery/conveyor/auto(loc, WEST) diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm index bfdf8a06e79..ffc147f4071 100644 --- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm +++ b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm @@ -41,7 +41,7 @@ /obj/item/stock_parts/micro_laser = 2 ) -/obj/machinery/ammo_workbench/Initialize() +/obj/machinery/ammo_workbench/Initialize(mapload) AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, allowed_items = /obj/item/stack, _after_insert = CALLBACK(src, .proc/AfterMaterialInsert)) . = ..() wires = new /datum/wires/ammo_workbench(src) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm index 0e4ae5ea4df..bbe396ae523 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm @@ -51,7 +51,7 @@ //when off of cooldown, will process COOLDOWN_DECLARE(process_timer) -/obj/structure/flora/ash_farming/Initialize() +/obj/structure/flora/ash_farming/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) COOLDOWN_START(src, harvest_timer, harvesting_cooldown) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm b/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm index e259602cdef..acfbee550ad 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/fuelwell.dm @@ -9,7 +9,7 @@ dispensedreagent = /datum/reagent/fuel color = "#742912" //Gives it a weldingfuel hue -/obj/structure/sink/fuel_well/Initialize() +/obj/structure/sink/fuel_well/Initialize(mapload) .=..() create_reagents(20) reagents.add_reagent(dispensedreagent, 20) diff --git a/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm b/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm index 8352dc0570b..d19261454b7 100644 --- a/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm +++ b/modular_skyrat/modules/ashwalkers/code/clothing/ash_armour.dm @@ -17,7 +17,7 @@ name = "Ash Headdress" result = /obj/item/clothing/head/ash_headdress -/obj/item/clothing/head/ash_headdress/Initialize() +/obj/item/clothing/head/ash_headdress/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 2, /obj/item/stack/sheet/animalhide/goliath_hide, list(MELEE = 5, BULLET = 2, LASER = 2)) @@ -46,7 +46,7 @@ name = "Ash Robes" result = /obj/item/clothing/under/costume/gladiator/ash_walker/ash_robes -/obj/item/clothing/under/costume/gladiator/ash_walker/ash_robes/Initialize() +/obj/item/clothing/under/costume/gladiator/ash_walker/ash_robes/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 2, /obj/item/stack/sheet/animalhide/goliath_hide, list(MELEE = 5, BULLET = 2, LASER = 2)) @@ -68,7 +68,7 @@ name = "Ash Combat Plates" result = /obj/item/clothing/suit/ash_plates -/obj/item/clothing/suit/ash_plates/Initialize() +/obj/item/clothing/suit/ash_plates/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 2, /obj/item/stack/sheet/animalhide/goliath_hide, list(MELEE = 5, BULLET = 2, LASER = 2)) diff --git a/modular_skyrat/modules/assault_operatives/code/areas.dm b/modular_skyrat/modules/assault_operatives/code/areas.dm index fc6c0bcc369..3b628947c0b 100644 --- a/modular_skyrat/modules/assault_operatives/code/areas.dm +++ b/modular_skyrat/modules/assault_operatives/code/areas.dm @@ -58,7 +58,7 @@ icon_state = "snukeop_spawn" delete_after_roundstart = FALSE -/obj/effect/landmark/start/assaultop/Initialize() +/obj/effect/landmark/start/assaultop/Initialize(mapload) . = ..() GLOB.assault_operative_start += get_turf(src) diff --git a/modular_skyrat/modules/assault_operatives/code/base_alarm.dm b/modular_skyrat/modules/assault_operatives/code/base_alarm.dm index 678a502ad3d..c4d43d9e97b 100644 --- a/modular_skyrat/modules/assault_operatives/code/base_alarm.dm +++ b/modular_skyrat/modules/assault_operatives/code/base_alarm.dm @@ -24,7 +24,7 @@ /// The area that we use to trigger other alarms. var/area/myarea = null -/obj/machinery/base_alarm/Initialize() +/obj/machinery/base_alarm/Initialize(mapload) . = ..() update_icon() myarea = get_area(src) diff --git a/modular_skyrat/modules/assault_operatives/code/misc_items.dm b/modular_skyrat/modules/assault_operatives/code/misc_items.dm index daf6e7f3423..8f4d3fe74ec 100644 --- a/modular_skyrat/modules/assault_operatives/code/misc_items.dm +++ b/modular_skyrat/modules/assault_operatives/code/misc_items.dm @@ -5,7 +5,7 @@ icon_state = "medpen_pouch" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS -/obj/item/storage/bag/medpens/Initialize() +/obj/item/storage/bag/medpens/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 30 diff --git a/modular_skyrat/modules/barricades/code/barricade.dm b/modular_skyrat/modules/barricades/code/barricade.dm index b005d36d099..fb04b6495be 100644 --- a/modular_skyrat/modules/barricades/code/barricade.dm +++ b/modular_skyrat/modules/barricades/code/barricade.dm @@ -26,7 +26,7 @@ ///is this barriade wired? var/is_wired = FALSE -/obj/structure/deployable_barricade/Initialize() +/obj/structure/deployable_barricade/Initialize(mapload) . = ..() update_icon() var/static/list/connections = list( @@ -810,7 +810,7 @@ icon_state = "box_metal" w_class = WEIGHT_CLASS_NORMAL -/obj/item/storage/barricade/Initialize() +/obj/item/storage/barricade/Initialize(mapload) . = ..() atom_storage.max_total_storage = 21 diff --git a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_mobs.dm b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_mobs.dm index 4ced285b374..85961229df6 100644 --- a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_mobs.dm +++ b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_mobs.dm @@ -40,7 +40,7 @@ maxbodytemp = INFINITY gender = MALE -/mob/living/simple_animal/hostile/biohazard_blob/oil_shambler/Initialize() +/mob/living/simple_animal/hostile/biohazard_blob/oil_shambler/Initialize(mapload) . = ..() update_overlays() @@ -157,7 +157,7 @@ minbodytemp = 0 maxbodytemp = INFINITY -/mob/living/simple_animal/hostile/biohazard_blob/centaur/Initialize() +/mob/living/simple_animal/hostile/biohazard_blob/centaur/Initialize(mapload) . = ..() update_overlays() diff --git a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm index 3bfeb4e2c63..12f3d8fa385 100644 --- a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm +++ b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm @@ -71,7 +71,7 @@ /obj/structure/biohazard_blob/structure/core/radioactive blob_type = BIO_BLOB_TYPE_RADIOACTIVE -/obj/structure/biohazard_blob/structure/core/Initialize() +/obj/structure/biohazard_blob/structure/core/Initialize(mapload) if(!blob_type) blob_type = pick(ALL_BIO_BLOB_TYPES) . = ..() @@ -257,7 +257,7 @@ var/list/registered_turfs = list() max_integrity = 100 -/obj/structure/biohazard_blob/structure/bulb/Initialize() +/obj/structure/biohazard_blob/structure/bulb/Initialize(mapload) . = ..() make_full() for(var/t in get_adjacent_open_turfs(src)) @@ -408,7 +408,7 @@ our_controller.other_structures -= src return ..() -/obj/structure/biohazard_blob/structure/conditioner/Initialize() +/obj/structure/biohazard_blob/structure/conditioner/Initialize(mapload) . = ..() switch(blob_type) if(BIO_BLOB_TYPE_FUNGUS) @@ -452,7 +452,7 @@ our_controller.other_structures -= src return ..() -/obj/structure/biohazard_blob/structure/spawner/Initialize() +/obj/structure/biohazard_blob/structure/spawner/Initialize(mapload) . = ..() switch(blob_type) if(BIO_BLOB_TYPE_FUNGUS) diff --git a/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm b/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm index 93212155eb3..dfab309a7f0 100644 --- a/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm +++ b/modular_skyrat/modules/black_mesa/code/armaments/__armament_bodyarmor.dm @@ -30,7 +30,7 @@ icon_state = "box" illustration = null -/obj/item/storage/box/armor_set/Initialize() +/obj/item/storage/box/armor_set/Initialize(mapload) . = ..() atom_storage.set_holdable(list(/obj/item/clothing/suit/armor,/obj/item/clothing/suit/space/hev_suit/pcv,/obj/item/clothing/head/helmet)) atom_storage.max_slots = 2 diff --git a/modular_skyrat/modules/black_mesa/code/rationpacks.dm b/modular_skyrat/modules/black_mesa/code/rationpacks.dm index f54f6f10359..839c3c20f64 100644 --- a/modular_skyrat/modules/black_mesa/code/rationpacks.dm +++ b/modular_skyrat/modules/black_mesa/code/rationpacks.dm @@ -84,7 +84,7 @@ icon_state = "mre_package" illustration = null -/obj/item/storage/box/hecu_rations/Initialize() +/obj/item/storage/box/hecu_rations/Initialize(mapload) . = ..() atom_storage.max_slots = 5 diff --git a/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm b/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm index d57c7927e6d..2b811f929d9 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm @@ -115,7 +115,7 @@ allowed = list(/obj/item/melee/baton/security/loaded) armor = list("melee" = 35, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 30, "bio" = 0, "fire" = 75, "acid" = 75) -/obj/item/clothing/suit/hooded/wintercoat/blueshield/Initialize() +/obj/item/clothing/suit/hooded/wintercoat/blueshield/Initialize(mapload) . = ..() allowed += GLOB.security_vest_allowed diff --git a/modular_skyrat/modules/blueshield/code/special.dm b/modular_skyrat/modules/blueshield/code/special.dm index 6a7035a5acf..941f9aa7068 100644 --- a/modular_skyrat/modules/blueshield/code/special.dm +++ b/modular_skyrat/modules/blueshield/code/special.dm @@ -35,7 +35,7 @@ chargerate = 300 var/obj/item/gun/energy/e_gun/revolver/pdw9/parent -/obj/item/stock_parts/cell/pdw9/Initialize() +/obj/item/stock_parts/cell/pdw9/Initialize(mapload) . = ..() parent = loc diff --git a/modular_skyrat/modules/bongs/code/bong.dm b/modular_skyrat/modules/bongs/code/bong.dm index 3c7e1296968..a30a6774ae7 100644 --- a/modular_skyrat/modules/bongs/code/bong.dm +++ b/modular_skyrat/modules/bongs/code/bong.dm @@ -32,7 +32,7 @@ ///How far does the smoke reach per use? var/smoke_range = 2 -/obj/item/bong/Initialize() +/obj/item/bong/Initialize(mapload) . = ..() create_reagents(chem_volume, INJECTABLE | NO_REACT) diff --git a/modular_skyrat/modules/cargoborg/code/robot_items.dm b/modular_skyrat/modules/cargoborg/code/robot_items.dm index f687ba7888c..d635715144f 100644 --- a/modular_skyrat/modules/cargoborg/code/robot_items.dm +++ b/modular_skyrat/modules/cargoborg/code/robot_items.dm @@ -20,7 +20,7 @@ var/paper_charge_cost = 50 -/obj/item/clipboard/cyborg/Initialize() +/obj/item/clipboard/cyborg/Initialize(mapload) . = ..() pen = new /obj/item/pen/cyborg @@ -360,7 +360,7 @@ alpha = 150 // It's hardlight, it's gotta be see-through. -/obj/item/paperplane/syndicate/hardlight/Initialize() +/obj/item/paperplane/syndicate/hardlight/Initialize(mapload) . = ..() color = color_hex2color_matrix(pick(paper_colors)) alpha = initial(alpha) // It's hardlight, it's gotta be see-through. diff --git a/modular_skyrat/modules/cellguns/code/cellgun_cells.dm b/modular_skyrat/modules/cellguns/code/cellgun_cells.dm index 505f470bca2..842ed421405 100644 --- a/modular_skyrat/modules/cellguns/code/cellgun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/cellgun_cells.dm @@ -28,7 +28,7 @@ else return FALSE -/obj/item/weaponcell/Initialize() +/obj/item/weaponcell/Initialize(mapload) . = ..() AddElement(/datum/element/item_scaling, 0.5, 1) refresh_shot_name() diff --git a/modular_skyrat/modules/cellguns/code/medigun_cells.dm b/modular_skyrat/modules/cellguns/code/medigun_cells.dm index 4171cc3c3d0..2564ee61de4 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_cells.dm @@ -549,7 +549,7 @@ buildstacktype = FALSE //It would not be good if people could use this to farm materials. var/deploytime = 20 SECONDS //How long the roller beds lasts for without someone buckled to it. -/obj/structure/bed/roller/medigun/Initialize() +/obj/structure/bed/roller/medigun/Initialize(mapload) . = ..() addtimer(CALLBACK(src, .proc/check_bed), deploytime) diff --git a/modular_skyrat/modules/cellguns/code/mediguns.dm b/modular_skyrat/modules/cellguns/code/mediguns.dm index 8c679392233..912e1f06a79 100644 --- a/modular_skyrat/modules/cellguns/code/mediguns.dm +++ b/modular_skyrat/modules/cellguns/code/mediguns.dm @@ -26,7 +26,7 @@ desc = "This is the upgraded version of the standard CWM-497 medigun, the battery inside is upgraded to better work with chargers along with having more capacity." cell_type = /obj/item/stock_parts/cell/medigun/upgraded -/obj/item/gun/energy/cell_loaded/medigun/upgraded/Initialize() +/obj/item/gun/energy/cell_loaded/medigun/upgraded/Initialize(mapload) . = ..() var/mutable_appearance/fastcharge_medigun = mutable_appearance('modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/projectile.dmi', "medigun_fastcharge") add_overlay(fastcharge_medigun) @@ -40,7 +40,7 @@ selfcharge = 1 can_charge = FALSE -/obj/item/gun/energy/cell_loaded/medigun/cmo/Initialize() +/obj/item/gun/energy/cell_loaded/medigun/cmo/Initialize(mapload) . = ..() var/mutable_appearance/cmo_medigun = mutable_appearance('modular_skyrat/modules/cellguns/icons/obj/guns/mediguns/projectile.dmi', "medigun_cmo") add_overlay(cmo_medigun) @@ -293,7 +293,7 @@ from_obj = /obj/item/food/grown/aloe to_obj = /obj/item/weaponcell/medical/utility/salve -/obj/item/device/custom_kit/empty_cell/Initialize() +/obj/item/device/custom_kit/empty_cell/Initialize(mapload) . = ..() AddElement(/datum/element/item_scaling, 0.5, 1) diff --git a/modular_skyrat/modules/central_command_module/code/computers/station_goal_computer.dm b/modular_skyrat/modules/central_command_module/code/computers/station_goal_computer.dm index 83703817283..44bd53615a4 100644 --- a/modular_skyrat/modules/central_command_module/code/computers/station_goal_computer.dm +++ b/modular_skyrat/modules/central_command_module/code/computers/station_goal_computer.dm @@ -16,7 +16,7 @@ greyscale_colors = CIRCUIT_COLOR_ENGINEERING build_path = /obj/machinery/computer/station_goal -/obj/machinery/computer/station_goal/Initialize() +/obj/machinery/computer/station_goal/Initialize(mapload) . = ..() station_goal_cache = subtypesof(/datum/station_goal) diff --git a/modular_skyrat/modules/cme/code/cme.dm b/modular_skyrat/modules/cme/code/cme.dm index 7b65e18b813..c66d30954f0 100644 --- a/modular_skyrat/modules/cme/code/cme.dm +++ b/modular_skyrat/modules/cme/code/cme.dm @@ -228,7 +228,7 @@ cme_heavy_range_lower = CME_ARMAGEDDON_HEAVY_RANGE_LOWER cme_heavy_range_upper = CME_ARMAGEDDON_HEAVY_RANGE_UPPER -/obj/effect/cme/Initialize() +/obj/effect/cme/Initialize(mapload) . = ..() playsound(src,'sound/weapons/resonator_fire.ogg',75,TRUE) var/turf/open/T = get_turf(src) diff --git a/modular_skyrat/modules/contractor/code/items/misc.dm b/modular_skyrat/modules/contractor/code/items/misc.dm index 4071e15a516..aa7e22cc6aa 100644 --- a/modular_skyrat/modules/contractor/code/items/misc.dm +++ b/modular_skyrat/modules/contractor/code/items/misc.dm @@ -1,7 +1,7 @@ /obj/item/paper/contractor_guide name = "Contractor Guide" -/obj/item/paper/contractor_guide/Initialize() +/obj/item/paper/contractor_guide/Initialize(mapload) default_raw_text = {"

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

diff --git a/modular_skyrat/modules/customization/game/objects/items/balls.dm b/modular_skyrat/modules/customization/game/objects/items/balls.dm index d3c10de363a..d3ec0b66813 100644 --- a/modular_skyrat/modules/customization/game/objects/items/balls.dm +++ b/modular_skyrat/modules/customization/game/objects/items/balls.dm @@ -18,7 +18,7 @@ inhand_icon_state = "tennis_rainbow" actions_types = list(/datum/action/item_action/squeeze) //Giving the masses easy access to unilimted honks would be annoying -/obj/item/toy/tennis/rainbow/Initialize() +/obj/item/toy/tennis/rainbow/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak) diff --git a/modular_skyrat/modules/customization/game/objects/items/plushes.dm b/modular_skyrat/modules/customization/game/objects/items/plushes.dm index ea4a25799ca..54409a8dca8 100644 --- a/modular_skyrat/modules/customization/game/objects/items/plushes.dm +++ b/modular_skyrat/modules/customization/game/objects/items/plushes.dm @@ -145,7 +145,7 @@ squeak_override = list('modular_skyrat/modules/emotes/sound/voice/slime_squish.ogg' = 1) young = TRUE //No. //Storage component for Sharknet Plushie// -/obj/item/toy/plush/sharknet/Initialize() +/obj/item/toy/plush/sharknet/Initialize(mapload) . = ..() create_storage(max_slots = 2, max_specific_storage = WEIGHT_CLASS_SMALL, canhold = list(/obj/item/toy/plush/skyrat/pintaplush)) @@ -440,7 +440,7 @@ ///the starting mixture for the liquid var/list/starting_mixture = list(/datum/reagent/consumable/pwr_game = 10) -/obj/effect/abstract/liquid_turf/pwr_gamr/Initialize() +/obj/effect/abstract/liquid_turf/pwr_gamr/Initialize(mapload) . = ..() reagent_list = starting_mixture total_reagents = 0 diff --git a/modular_skyrat/modules/customization/game/objects/items/storage/belt.dm b/modular_skyrat/modules/customization/game/objects/items/storage/belt.dm index 11172a3480b..b843c570dda 100644 --- a/modular_skyrat/modules/customization/game/objects/items/storage/belt.dm +++ b/modular_skyrat/modules/customization/game/objects/items/storage/belt.dm @@ -12,7 +12,7 @@ worn_icon_state = "mailbelt" equip_sound = 'sound/items/equip/toolbelt_equip.ogg' -/obj/item/storage/belt/mailbelt/Initialize() +/obj/item/storage/belt/mailbelt/Initialize(mapload) . = ..() atom_storage.max_slots = 14 atom_storage.numerical_stacking = TRUE diff --git a/modular_skyrat/modules/customization/game/objects/items/storage/rings.dm b/modular_skyrat/modules/customization/game/objects/items/storage/rings.dm index 5c8f63273be..8b3ac988d1f 100644 --- a/modular_skyrat/modules/customization/game/objects/items/storage/rings.dm +++ b/modular_skyrat/modules/customization/game/objects/items/storage/rings.dm @@ -12,7 +12,7 @@ spawn_type = /obj/item/clothing/gloves/ring spawn_count = 1 -/obj/item/storage/fancy/ringbox/Initialize() +/obj/item/storage/fancy/ringbox/Initialize(mapload) . = ..() atom_storage.max_slots = 1 atom_storage.can_hold = typecacheof(list(/obj/item/clothing/gloves/ring)) diff --git a/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm b/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm index 04f849129a8..fd4c5f0ac91 100644 --- a/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm +++ b/modular_skyrat/modules/customization/modules/clothing/ears/ears.dm @@ -10,7 +10,7 @@ var/headphones_on = FALSE custom_price = 60 -/obj/item/clothing/ears/headphones/Initialize() +/obj/item/clothing/ears/headphones/Initialize(mapload) . = ..() update_icon() diff --git a/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm b/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm index cc653244c69..e4f0c079aba 100644 --- a/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm +++ b/modular_skyrat/modules/customization/modules/clothing/glasses/glasses.dm @@ -50,7 +50,7 @@ current_eye = "_L" src.icon_state = current_sprite_state + current_eye -/obj/item/clothing/glasses/Initialize() +/obj/item/clothing/glasses/Initialize(mapload) . = ..() current_sprite_state = icon_state //Stores the standard sprite state. if(!can_switch_eye) //Just runs the normal code for any item that we havent manually set this as TRUE for diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index 40a86e75f2d..ffc20d7202d 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/head.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/head.dm @@ -8,7 +8,7 @@ desc = "A dilapidated helmet used in ancient wars. This one is brittle and essentially useless. An ace of spades is tucked into the band around the outer shell." supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/obj/item/clothing/head/flakhelm/Initialize() +/obj/item/clothing/head/flakhelm/Initialize(mapload) . = ..() create_storage(type = /datum/storage/pockets/tiny/spacenam) diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm index e0374294af6..53f0b59cdb6 100644 --- a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm +++ b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm @@ -26,7 +26,7 @@ /// What treat item spawns inside the collar? var/treat_path = /obj/item/food/cookie -/obj/item/clothing/neck/human_petcollar/Initialize() +/obj/item/clothing/neck/human_petcollar/Initialize(mapload) . = ..() create_storage(type = /datum/storage/pockets/small/collar) if(treat_path) @@ -63,7 +63,7 @@ /// Is the collar currently locked? var/locked = FALSE -/obj/item/clothing/neck/human_petcollar/locked/Initialize() +/obj/item/clothing/neck/human_petcollar/locked/Initialize(mapload) . = ..() create_storage(type = /datum/storage/pockets/small/collar/locked) diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm index cb6b86cd4a8..bf959a348f4 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm @@ -75,7 +75,7 @@ . = ..() AddElement(/datum/element/update_icon_updates_onmob) -/obj/item/storage/belt/crusader/Initialize() +/obj/item/storage/belt/crusader/Initialize(mapload) . = ..() atom_storage.max_slots = 2 @@ -126,7 +126,7 @@ atom_storage.show_contents(user) -/obj/item/storage/belt/storage_pouch/Initialize() +/obj/item/storage/belt/storage_pouch/Initialize(mapload) . = ..() atom_storage.max_slots = 6 @@ -149,7 +149,7 @@ icon_state = "med_bandolier" worn_icon_state = "med_bandolier" -/obj/item/storage/belt/medbandolier/Initialize() +/obj/item/storage/belt/medbandolier/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_slots = 14 diff --git a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm index a8e3509e4ee..154adba9b46 100644 --- a/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm +++ b/modular_skyrat/modules/customization/modules/clothing/under/utility_port/suits_port.dm @@ -117,7 +117,7 @@ icon_state = "labcoat_pmedred" supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/toggle/labcoat/para_red/Initialize() +/obj/item/clothing/suit/toggle/labcoat/para_red/Initialize(mapload) . = ..() allowed += list( /obj/item/storage/medkit, diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index b93d1dca469..04d0a34109e 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -600,7 +600,7 @@ /// What treat item spawns inside the collar? var/treat_path = /obj/item/food/cookie -/obj/item/clothing/neck/inferno_collar/Initialize() +/obj/item/clothing/neck/inferno_collar/Initialize(mapload) . = ..() create_storage(type = /datum/storage/pockets/small/collar) if(treat_path) @@ -640,7 +640,7 @@ worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/custom_w.dmi' icon_state = "darksheath" -/obj/item/storage/belt/sabre/darksabre/Initialize() +/obj/item/storage/belt/sabre/darksabre/Initialize(mapload) . = ..() atom_storage.set_holdable(list( /obj/item/toy/darksabre @@ -674,7 +674,7 @@ actions_types = list(/datum/action/item_action/hheart) supports_variations_flags = NONE -/obj/item/clothing/mask/hheart/Initialize() +/obj/item/clothing/mask/hheart/Initialize(mapload) . = ..() update_icon() @@ -983,7 +983,7 @@ /// The sound played when toggling the shutters. var/shutters_sound = 'sound/effects/clock_tick.ogg' -/obj/item/clothing/glasses/welding/steampunk_goggles/Initialize() +/obj/item/clothing/glasses/welding/steampunk_goggles/Initialize(mapload) . = ..() visor_toggling() diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm index 3898f5a6b3c..b80e7eba944 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm @@ -38,7 +38,7 @@ genital_size = size update_sprite_suffix() -/obj/item/organ/external/genital/Initialize() +/obj/item/organ/external/genital/Initialize(mapload) . = ..() update_sprite_suffix() @@ -447,7 +447,7 @@ return //Removing ERP IC verb depending on config -/mob/living/carbon/human/Initialize() +/mob/living/carbon/human/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_erp_preferences)) verbs -= /mob/living/carbon/human/verb/toggle_genitals diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm index 16302e17c1e..ac69342a036 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm @@ -9,7 +9,7 @@ /// Relevant layer flags, as set by the organ's associated sprite_accessory, should there be one. var/relevant_layers -/obj/item/organ/Initialize() +/obj/item/organ/Initialize(mapload) . = ..() if(mutantpart_key) color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] diff --git a/modular_skyrat/modules/customization/readme.md b/modular_skyrat/modules/customization/readme.md index bac61a5ed2f..a21ba83d5b1 100644 --- a/modular_skyrat/modules/customization/readme.md +++ b/modular_skyrat/modules/customization/readme.md @@ -27,7 +27,7 @@ Re-writes how mutant bodyparts exist and how they're handled. Adds in a per limb ./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm the 5 procs related to wagging tail and - /datum/species/lizard/on_species_gain() ./code/modules/surgery/bodyparts/_bodyparts.dm > /obj/item/bodypart/proc/get_limb_icon() ./code/modules/surgery/organs/ears.dm > /obj/item/organ/internal/ears/cat/Insert(), /obj/item/organ/internal/ears/cat/Remove() - ./code/modules/surgery/organs/tails.dm > /obj/item/organ/external/tail/cat/Insert(), /obj/item/organ/external/tail/cat/Remove(), /obj/item/organ/external/tail/lizard/Initialize(), /obj/item/organ/external/tail/lizard/Insert(), /obj/item/organ/external/tail/lizard/Remove() + ./code/modules/surgery/organs/tails.dm > /obj/item/organ/external/tail/cat/Insert(), /obj/item/organ/external/tail/cat/Remove(), /obj/item/organ/external/tail/lizard/Initialize(mapload), /obj/item/organ/external/tail/lizard/Insert(), /obj/item/organ/external/tail/lizard/Remove() ./code/modules/surgery/bodyparts/dismemberment.dm > /mob/living/carbon/regenerate_limb() ./code/modules/mob/living/carbon/human/status_procs.dm > /mob/living/carbon/human/become_husk() > APPENDED ./code/modules/reagents/chemistry/holder.dm > /datum/reagents/metabolize() diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm index 277118a53ad..ef5ee4d4538 100644 --- a/modular_skyrat/modules/decay_subsystem/code/nests.dm +++ b/modular_skyrat/modules/decay_subsystem/code/nests.dm @@ -36,7 +36,7 @@ /// Does this nest passively spawn mobs too? var/passive_spawning = FALSE -/obj/structure/mob_spawner/Initialize() +/obj/structure/mob_spawner/Initialize(mapload) . = ..() calculate_trigger_turfs() if(passive_spawning) diff --git a/modular_skyrat/modules/exp_corps/code/gear.dm b/modular_skyrat/modules/exp_corps/code/gear.dm index b929e0c66de..423546eda7e 100644 --- a/modular_skyrat/modules/exp_corps/code/gear.dm +++ b/modular_skyrat/modules/exp_corps/code/gear.dm @@ -97,7 +97,7 @@ /obj/item/storage/bag/ammo/marksman name = "marksman's knife pouch" -/obj/item/storage/bag/ammo/marksman/Initialize() +/obj/item/storage/bag/ammo/marksman/Initialize(mapload) . = ..() create_storage(type = /datum/storage/marksman) diff --git a/modular_skyrat/modules/exp_corps/code/tomahawk.dm b/modular_skyrat/modules/exp_corps/code/tomahawk.dm index ae192f54056..a8672f38ad4 100644 --- a/modular_skyrat/modules/exp_corps/code/tomahawk.dm +++ b/modular_skyrat/modules/exp_corps/code/tomahawk.dm @@ -19,6 +19,6 @@ hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED -/obj/item/melee/tomahawk/Initialize() +/obj/item/melee/tomahawk/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 70, 100) diff --git a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm index 8d85174aa20..ec6549f1a7e 100644 --- a/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm +++ b/modular_skyrat/modules/ghostcafe/code/ghost_role_spawners.dm @@ -5,7 +5,7 @@ flavour_text = "You are a robot. This probably shouldn't be happening." mob_type = /mob/living/silicon/robot -/obj/effect/mob_spawn/ghost_role/robot/Initialize() +/obj/effect/mob_spawn/ghost_role/robot/Initialize(mapload) . = ..() /obj/effect/mob_spawn/ghost_role/robot/equip(mob/living/silicon/robot/R) diff --git a/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm b/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm index 1fd6978d315..d4ce20b0c90 100644 --- a/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm +++ b/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm @@ -3,7 +3,7 @@ scrambledcodes = TRUE // Roleplay borgs aren't real set_model = /obj/item/robot_model/roleplay -/mob/living/silicon/robot/model/roleplay/Initialize() +/mob/living/silicon/robot/model/roleplay/Initialize(mapload) . = ..() cell = new /obj/item/stock_parts/cell/infinite(src, 30000) laws = new /datum/ai_laws/roleplay() diff --git a/modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm b/modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm index 1d7be3d1d02..bcde6663cfc 100644 --- a/modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm +++ b/modular_skyrat/modules/gun_cargo/code/objects/guns/interdyne.dm @@ -7,7 +7,7 @@ company_flag = COMPANY_INTERDYNE var/obj/item/gun/syringe/smartdart/underbarrel/underbarrel -/obj/item/gun/ballistic/automatic/pistol/firefly/smartdart/Initialize() +/obj/item/gun/ballistic/automatic/pistol/firefly/smartdart/Initialize(mapload) . = ..() underbarrel = new(src) update_appearance() diff --git a/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm b/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm index 8a756eee34d..54c928e75d7 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm @@ -25,7 +25,7 @@ var/reload_time = 2 SECONDS -/obj/item/gun/ballistic/Initialize() +/obj/item/gun/ballistic/Initialize(mapload) . = ..() if(realistic) base_spread = spread diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm index bd7a1fc851f..88eb37aff79 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm @@ -123,7 +123,7 @@ /// Have we overheated? var/overheated = FALSE -/obj/item/gun/ballistic/automatic/mg34/mg42/Initialize() +/obj/item/gun/ballistic/automatic/mg34/mg42/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_GUN_FIRED, .proc/process_heat) START_PROCESSING(SSobj, src) diff --git a/modular_skyrat/modules/hev_suit/code/hev_suit.dm b/modular_skyrat/modules/hev_suit/code/hev_suit.dm index 6c2a577c488..f8616bee4b9 100644 --- a/modular_skyrat/modules/hev_suit/code/hev_suit.dm +++ b/modular_skyrat/modules/hev_suit/code/hev_suit.dm @@ -166,7 +166,7 @@ /// On first activation, we play the user a nice song! var/first_use = TRUE -/obj/item/clothing/suit/space/hev_suit/Initialize() +/obj/item/clothing/suit/space/hev_suit/Initialize(mapload) . = ..() internal_radio = new(src) internal_radio.subspace_transmission = TRUE diff --git a/modular_skyrat/modules/horrorform/code/true_changeling.dm b/modular_skyrat/modules/horrorform/code/true_changeling.dm index 864649a8078..f292290edf0 100644 --- a/modular_skyrat/modules/horrorform/code/true_changeling.dm +++ b/modular_skyrat/modules/horrorform/code/true_changeling.dm @@ -49,7 +49,7 @@ transformed_time = world.time emote("scream") -/mob/living/simple_animal/hostile/true_changeling/Initialize() +/mob/living/simple_animal/hostile/true_changeling/Initialize(mapload) . = ..() to_chat(src, playstyle_string) turn_to_human = new /datum/action/innate/turn_to_human diff --git a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm index 8b82aaa562f..5a03c05f2eb 100644 --- a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm +++ b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm @@ -19,7 +19,7 @@ . = ..() . += span_notice("Ctrl-Shift-Click to reskin this") -/obj/item/storage/hypospraykit/Initialize() +/obj/item/storage/hypospraykit/Initialize(mapload) . = ..() if(!length(case_designs)) populate_case_designs() diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm index a36e126b55e..71086bc9544 100644 --- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm +++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm @@ -62,7 +62,7 @@ inject_self = DELUXE_SELF_INJECT penetrates = INJECT_CHECK_PENETRATE_THICK -/obj/item/hypospray/mkii/Initialize() +/obj/item/hypospray/mkii/Initialize(mapload) . = ..() if(!spawnwithvial) update_appearance() diff --git a/modular_skyrat/modules/hyposprays/code/hypovials.dm b/modular_skyrat/modules/hyposprays/code/hypovials.dm index b6a933ebfe9..d4a3ae14f30 100644 --- a/modular_skyrat/modules/hyposprays/code/hypovials.dm +++ b/modular_skyrat/modules/hyposprays/code/hypovials.dm @@ -35,7 +35,7 @@ chem_color = filling.color . += filling -/obj/item/reagent_containers/glass/vial/Initialize() +/obj/item/reagent_containers/glass/vial/Initialize(mapload) . = ..() update_icon() diff --git a/modular_skyrat/modules/hyposprays/code/vending_hypospray.dm b/modular_skyrat/modules/hyposprays/code/vending_hypospray.dm index 90782f2376f..3441c2175c6 100644 --- a/modular_skyrat/modules/hyposprays/code/vending_hypospray.dm +++ b/modular_skyrat/modules/hyposprays/code/vending_hypospray.dm @@ -1,3 +1,3 @@ -/obj/machinery/vending/drugs/Initialize() +/obj/machinery/vending/drugs/Initialize(mapload) products[/obj/item/storage/hypospraykit/empty] = 5 - . = ..() + . = ..() diff --git a/modular_skyrat/modules/inflatables/code/inflatable.dm b/modular_skyrat/modules/inflatables/code/inflatable.dm index cffa24721a4..991b987afe1 100644 --- a/modular_skyrat/modules/inflatables/code/inflatable.dm +++ b/modular_skyrat/modules/inflatables/code/inflatable.dm @@ -214,7 +214,7 @@ icon_state = "briefcase_inflate" w_class = WEIGHT_CLASS_NORMAL -/obj/item/storage/inflatable/Initialize() +/obj/item/storage/inflatable/Initialize(mapload) . = ..() atom_storage.max_total_storage = 21 diff --git a/modular_skyrat/modules/jukebox/code/dance_machine.dm b/modular_skyrat/modules/jukebox/code/dance_machine.dm index 005b8e6f59d..d3a4493619d 100644 --- a/modular_skyrat/modules/jukebox/code/dance_machine.dm +++ b/modular_skyrat/modules/jukebox/code/dance_machine.dm @@ -30,7 +30,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags_1 = NODECONSTRUCT_1 -/obj/machinery/jukebox/Initialize() +/obj/machinery/jukebox/Initialize(mapload) . = ..() songs = SSjukeboxes.songs if(songs.len) diff --git a/modular_skyrat/modules/jungle/code/flora.dm b/modular_skyrat/modules/jungle/code/flora.dm index 22f8b9f5257..47b3677745b 100644 --- a/modular_skyrat/modules/jungle/code/flora.dm +++ b/modular_skyrat/modules/jungle/code/flora.dm @@ -11,7 +11,7 @@ var/base_icon var/list/random_light = list("#6AFF00","#00FFEE", "#D9FF00", "#FFC800") -/obj/structure/flora/biolumi/Initialize() +/obj/structure/flora/biolumi/Initialize(mapload) . = ..() base_icon = "[initial(icon_state)][rand(1,variants)]" icon_state = base_icon diff --git a/modular_skyrat/modules/knives/knives.dm b/modular_skyrat/modules/knives/knives.dm index 495a02d4af3..edbb70adaa7 100644 --- a/modular_skyrat/modules/knives/knives.dm +++ b/modular_skyrat/modules/knives/knives.dm @@ -25,7 +25,7 @@ w_class = WEIGHT_CLASS_BULKY resistance_flags = FLAMMABLE -/obj/item/storage/belt/bowie_sheath/Initialize() +/obj/item/storage/belt/bowie_sheath/Initialize(mapload) . = ..() atom_storage.max_slots = 1 atom_storage.max_total_storage = WEIGHT_CLASS_BULKY diff --git a/modular_skyrat/modules/large_doors/code/large_doors.dm b/modular_skyrat/modules/large_doors/code/large_doors.dm index 05238580f8d..628543391c6 100644 --- a/modular_skyrat/modules/large_doors/code/large_doors.dm +++ b/modular_skyrat/modules/large_doors/code/large_doors.dm @@ -91,7 +91,7 @@ dir = EAST var/width = 1 -/obj/structure/door_assembly/multi_tile/Initialize() +/obj/structure/door_assembly/multi_tile/Initialize(mapload) . = ..() update_dir() diff --git a/modular_skyrat/modules/liquids/code/drains.dm b/modular_skyrat/modules/liquids/code/drains.dm index faaa6a9a4ab..e357c74f576 100644 --- a/modular_skyrat/modules/liquids/code/drains.dm +++ b/modular_skyrat/modules/liquids/code/drains.dm @@ -49,7 +49,7 @@ return my_turf.liquids.liquid_simple_delete_flat(drain_flat + (drain_percent * my_turf.liquids.total_reagents)) -/obj/structure/drain/Initialize() +/obj/structure/drain/Initialize(mapload) . = ..() if(!isturf(loc)) stack_trace("Drain structure initialized not on a turf") diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm index 02fd9156651..7d25cb617f5 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm @@ -439,7 +439,7 @@ else to_chat(M, span_userdanger("You fall in the water!")) -/obj/effect/abstract/liquid_turf/Initialize() +/obj/effect/abstract/liquid_turf/Initialize(mapload) . = ..() if(!SSliquids) CRASH("Liquid Turf created with the liquids sybsystem not yet initialized!") @@ -596,7 +596,7 @@ /obj/effect/abstract/liquid_turf/immutable/ocean/warm starting_temp = T20C+20 -/obj/effect/abstract/liquid_turf/immutable/Initialize() +/obj/effect/abstract/liquid_turf/immutable/Initialize(mapload) . = ..() reagent_list = starting_mixture.Copy() total_reagents = 0 diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm index 4aaacfbc153..17fc60ce1af 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_pump.dm @@ -90,7 +90,7 @@ turned_on = !turned_on update_icon() -/obj/structure/liquid_pump/Initialize() +/obj/structure/liquid_pump/Initialize(mapload) . = ..() create_reagents(max_volume) diff --git a/modular_skyrat/modules/liquids/code/ocean_flora.dm b/modular_skyrat/modules/liquids/code/ocean_flora.dm index 06ef934e792..d8916a84e40 100644 --- a/modular_skyrat/modules/liquids/code/ocean_flora.dm +++ b/modular_skyrat/modules/liquids/code/ocean_flora.dm @@ -2,7 +2,7 @@ icon = 'modular_skyrat/modules/liquids/icons/obj/flora/ocean_flora.dmi' var/random_variants = 0 -/obj/structure/flora/ocean/Initialize() +/obj/structure/flora/ocean/Initialize(mapload) . = ..() if(random_variants) icon_state = "[icon_state][rand(1,random_variants)]" @@ -50,7 +50,7 @@ var/random_variants = 3 var/welds_remaining = 0 -/obj/structure/flora/scrap/Initialize() +/obj/structure/flora/scrap/Initialize(mapload) . = ..() welds_remaining = rand(SCRAP_WELD_LOW, SCRAP_WELD_HIGH) if(random_variants) diff --git a/modular_skyrat/modules/liquids/code/ocean_turfs.dm b/modular_skyrat/modules/liquids/code/ocean_turfs.dm index 852d79d4944..0ac630e60ca 100644 --- a/modular_skyrat/modules/liquids/code/ocean_turfs.dm +++ b/modular_skyrat/modules/liquids/code/ocean_turfs.dm @@ -4,7 +4,7 @@ baseturfs = /turf/open/openspace/ocean var/replacement_turf = /turf/open/floor/plating/ocean -/turf/open/openspace/ocean/Initialize() +/turf/open/openspace/ocean/Initialize(mapload) . = ..() for(var/obj/structure/flora/plant in contents) @@ -21,7 +21,7 @@ M.gets_drilled() baseturfs = /turf/open/openspace/ocean //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace. -/turf/open/openspace/ocean/Initialize() +/turf/open/openspace/ocean/Initialize(mapload) . = ..() if(liquids) if(liquids.immutable) @@ -86,7 +86,7 @@ var/rand_chance = 30 var/liquid_type = /obj/effect/abstract/liquid_turf/immutable/ocean -/turf/open/floor/plating/ocean/Initialize() +/turf/open/floor/plating/ocean/Initialize(mapload) . = ..() if(liquids) if(liquids.immutable) @@ -105,7 +105,7 @@ planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/ocean_plating -/turf/open/floor/plating/ocean_plating/Initialize() +/turf/open/floor/plating/ocean_plating/Initialize(mapload) . = ..() if(liquids) if(liquids.immutable) @@ -119,7 +119,7 @@ planetary_atmos = TRUE baseturfs = /turf/open/floor/iron/ocean -/turf/open/floor/iron/ocean/Initialize() +/turf/open/floor/iron/ocean/Initialize(mapload) . = ..() if(liquids) if(liquids.immutable) @@ -174,7 +174,7 @@ liquid_height = -30 turf_height = -30 -/turf/open/floor/plating/canal/Initialize() +/turf/open/floor/plating/canal/Initialize(mapload) . = ..() if(liquids) if(liquids.immutable) diff --git a/modular_skyrat/modules/mapping/code/dungeon.dm b/modular_skyrat/modules/mapping/code/dungeon.dm index cfe33f1dcb4..4c5778ae8aa 100644 --- a/modular_skyrat/modules/mapping/code/dungeon.dm +++ b/modular_skyrat/modules/mapping/code/dungeon.dm @@ -69,7 +69,7 @@ density = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/structure/railing/stone/Initialize() +/obj/structure/railing/stone/Initialize(mapload) .=..() if(dir == 2) layer = ABOVE_MOB_LAYER diff --git a/modular_skyrat/modules/mapping/code/fluff.dm b/modular_skyrat/modules/mapping/code/fluff.dm index 9f8a7d1d2e7..639aae545e3 100644 --- a/modular_skyrat/modules/mapping/code/fluff.dm +++ b/modular_skyrat/modules/mapping/code/fluff.dm @@ -29,7 +29,7 @@ storedinfo_otherside = list() timestamp_otherside = list() -/obj/item/tape/ruins/random/Initialize() +/obj/item/tape/ruins/random/Initialize(mapload) icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple", "greyscale")]" . = ..() //End of lore tape subtype diff --git a/modular_skyrat/modules/mapping/code/planet_turfs.dm b/modular_skyrat/modules/mapping/code/planet_turfs.dm index 1ffe4ea555d..4ad5e5fca8c 100644 --- a/modular_skyrat/modules/mapping/code/planet_turfs.dm +++ b/modular_skyrat/modules/mapping/code/planet_turfs.dm @@ -65,7 +65,7 @@ anchored = TRUE vis_flags = NONE -/turf/open/misc/asteroid/snow/indestructible/overlay/Initialize() +/turf/open/misc/asteroid/snow/indestructible/overlay/Initialize(mapload) ..() vis_contents += snow_overlay */ diff --git a/modular_skyrat/modules/mapping/code/pool.dm b/modular_skyrat/modules/mapping/code/pool.dm index 65858702dbc..230fd6e26e0 100644 --- a/modular_skyrat/modules/mapping/code/pool.dm +++ b/modular_skyrat/modules/mapping/code/pool.dm @@ -22,7 +22,7 @@ layer = BELOW_MOB_LAYER vis_flags = NONE -/turf/open/water/overlay/Initialize() +/turf/open/water/overlay/Initialize(mapload) . = ..() var/obj/effect/overlay/water/water_overlay = new() var/obj/effect/overlay/water/top/water_top_overlay = new() diff --git a/modular_skyrat/modules/marines/code/gear.dm b/modular_skyrat/modules/marines/code/gear.dm index b2ff5c0bcbf..84ecc74e4de 100644 --- a/modular_skyrat/modules/marines/code/gear.dm +++ b/modular_skyrat/modules/marines/code/gear.dm @@ -51,7 +51,7 @@ icon_state = "m44a_s" inhand_icon_state = "m44a_s" -/obj/item/gun/ballistic/automatic/ar/modular/m44a/scoped/Initialize() +/obj/item/gun/ballistic/automatic/ar/modular/m44a/scoped/Initialize(mapload) . = ..() AddComponent(/datum/component/scope, range_modifier = 2.2) @@ -74,7 +74,7 @@ /// Reference to the underbarrel shotgun var/obj/item/gun/ballistic/shotgun/automatic/as2/ubsg/underbarrel -/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/Initialize() +/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/Initialize(mapload) . = ..() underbarrel = new /obj/item/gun/ballistic/shotgun/automatic/as2/ubsg(src) update_appearance() @@ -98,7 +98,7 @@ /// Underbarrel grenade launcher reference var/obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel -/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/Initialize() +/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/Initialize(mapload) . = ..() underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(src) update_appearance() diff --git a/modular_skyrat/modules/medical/code/smartdarts.dm b/modular_skyrat/modules/medical/code/smartdarts.dm index e1bf55d038c..003c195fcdb 100644 --- a/modular_skyrat/modules/medical/code/smartdarts.dm +++ b/modular_skyrat/modules/medical/code/smartdarts.dm @@ -49,7 +49,7 @@ has_gun_safety = TRUE item_flags = null -/obj/item/gun/syringe/smartdart/Initialize() +/obj/item/gun/syringe/smartdart/Initialize(mapload) . = ..() chambered = new /obj/item/ammo_casing/syringegun/dart(src) diff --git a/modular_skyrat/modules/modular_items/code/bags.dm b/modular_skyrat/modules/modular_items/code/bags.dm index c606e26b311..9b40cbeaa44 100644 --- a/modular_skyrat/modules/modular_items/code/bags.dm +++ b/modular_skyrat/modules/modular_items/code/bags.dm @@ -8,7 +8,7 @@ resistance_flags = FLAMMABLE custom_price = PAYCHECK_CREW * 4 -/obj/item/storage/bag/ammo/Initialize() +/obj/item/storage/bag/ammo/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 30 @@ -26,7 +26,7 @@ resistance_flags = FLAMMABLE custom_price = PAYCHECK_CREW * 4 -/obj/item/storage/bag/material/Initialize() +/obj/item/storage/bag/material/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = INFINITY diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm index c634bc557d7..02c7392faa9 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/arousal_system.dm @@ -153,7 +153,7 @@ var/pain_limit = 0 var/arousal_status = AROUSAL_NONE -/mob/living/carbon/human/Initialize() +/mob/living/carbon/human/Initialize(mapload) . = ..() if(!istype(src, /mob/living/carbon/human/species/monkey)) apply_status_effect(/datum/status_effect/aroused) @@ -178,7 +178,7 @@ to_chat(src, span_warning("You can't cum right now!")) //Removing ERP IC verb depending on config -/mob/living/carbon/human/Initialize() +/mob/living/carbon/human/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_erp_preferences)) verbs -= /mob/living/carbon/human/verb/arousal_panel @@ -680,7 +680,7 @@ var/pain_level = "small" var/pleasure_level = "small" -/atom/movable/screen/alert/aroused_x/Initialize() +/atom/movable/screen/alert/aroused_x/Initialize(mapload) .=..() pain_overlay = update_pain() pleasure_overlay = update_pleasure() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index 5899d721197..6bbaf10f1fe 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -93,7 +93,7 @@ return TRUE // Initializing stuff -/obj/item/clothing/mask/gas/bdsm_mask/Initialize() +/obj/item/clothing/mask/gas/bdsm_mask/Initialize(mapload) . = ..() update_icon_state() update_icon() @@ -290,7 +290,7 @@ list_reagents = list(/datum/reagent/drug/aphrodisiac/crocin = 50) // Standard initialize code for filter -/obj/item/reagent_containers/glass/lewd_filter/Initialize() +/obj/item/reagent_containers/glass/lewd_filter/Initialize(mapload) . = ..() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm index dfff4c2bd11..b7e4f7c1ec1 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm @@ -322,7 +322,7 @@ return FALSE return TRUE -/obj/item/clothing/head/helmet/space/deprivation_helmet/Initialize() +/obj/item/clothing/head/helmet/space/deprivation_helmet/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm index 73ff6f125a6..13c8cead088 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/erp_belt.dm @@ -11,7 +11,7 @@ drop_sound = 'sound/items/handling/toolbelt_drop.ogg' pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg' -/obj/item/storage/belt/erpbelt/Initialize() +/obj/item/storage/belt/erpbelt/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL atom_storage.max_total_storage = 21 diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm index 85aefaf065c..4aa5b801701 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm @@ -83,7 +83,7 @@ return FALSE return TRUE -/obj/item/clothing/glasses/hypno/Initialize() +/obj/item/clothing/glasses/hypno/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm index 3ed85727829..3852ed24ebd 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kink_collars.dm @@ -54,7 +54,7 @@ //spawn thing in collar -/obj/item/clothing/neck/kink_collar/Initialize() +/obj/item/clothing/neck/kink_collar/Initialize(mapload) . = ..() create_storage(type = /datum/storage/pockets/small/kink_collar) var/obj/item/key/kink_collar/key @@ -294,7 +294,7 @@ var/obj/item/mind_controller/remote = null var/emoting = "Shivers." -/obj/item/clothing/neck/mind_collar/Initialize() +/obj/item/clothing/neck/mind_collar/Initialize(mapload) . = ..() create_storage(type = /datum/storage/pockets/small/kink_collar/mind_collar) remote = new /obj/item/mind_controller(src, src) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm index ee9019ce5cc..0ff2dc1677b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm @@ -48,7 +48,7 @@ return FALSE return TRUE -/obj/item/clothing/glasses/blindfold/kinky/Initialize() +/obj/item/clothing/glasses/blindfold/kinky/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm index 5c2ddc98c45..1f10c4bfb9b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm @@ -74,7 +74,7 @@ //to make it change model on click -/obj/item/clothing/ears/kinky_headphones/Initialize() +/obj/item/clothing/ears/kinky_headphones/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm index 7dfa7d680fe..f7c2c3aa39f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm @@ -91,7 +91,7 @@ return FALSE return TRUE -/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/Initialize() +/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm index e13d850218a..3a8fadc799f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm @@ -89,7 +89,7 @@ //Plug to bypass the bug with instant suit equip/drop /obj/item/clothing/under/misc/latex_catsuit/MouseDrop(atom/over_object) -/obj/item/clothing/under/misc/latex_catsuit/Initialize() +/obj/item/clothing/under/misc/latex_catsuit/Initialize(mapload) . = ..() breasts_overlay = mutable_appearance('modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_uniform/lewd_uniform.dmi', "none", ABOVE_MOB_LAYER) breasts_overlay.icon_state = "breasts" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm index d0b00688049..354117f1869 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm @@ -32,7 +32,7 @@ /// List of all apron designs, used in selecting one in the radial menu var/static/list/apron_designs -/obj/item/clothing/under/costume/lewdmaid/Initialize() +/obj/item/clothing/under/costume/lewdmaid/Initialize(mapload) . = ..() var/obj/item/clothing/accessory/lewdapron/apron_accessory = new(src) attach_accessory(apron_accessory) @@ -73,7 +73,7 @@ return FALSE return TRUE -/obj/item/clothing/accessory/lewdapron/Initialize() +/obj/item/clothing/accessory/lewdapron/Initialize(mapload) if(!length(apron_designs)) populate_apron_designs() update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm index 90de350aa80..4865f56851c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_shoes.dm @@ -13,7 +13,7 @@ worn_icon_taur_snake = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_clothing/lewd_shoes.dmi' supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION|STYLE_TAUR_ALL -/obj/item/clothing/shoes/latex_heels/Initialize() +/obj/item/clothing/shoes/latex_heels/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('modular_skyrat/modules/modular_items/lewd_items/sounds/highheel1.ogg' = 1, 'modular_skyrat/modules/modular_items/lewd_items/sounds/highheel2.ogg' = 1), 70) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm index b84e2d99640..326ae9e0f44 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm @@ -60,7 +60,7 @@ return FALSE return TRUE -/obj/item/clothing/suit/straight_jacket/shackles/Initialize() +/obj/item/clothing/suit/straight_jacket/shackles/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm index 1d37487821f..bf8a1455679 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm @@ -71,7 +71,7 @@ else return ..() -/obj/item/electropack/shockcollar/Initialize() +/obj/item/electropack/shockcollar/Initialize(mapload) if(random) code = rand(1, 100) frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm index 963bf512ec5..7ce40344af1 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm @@ -49,7 +49,7 @@ return FALSE return TRUE -/obj/item/clothing/strapon/Initialize() +/obj/item/clothing/strapon/Initialize(mapload) . = ..() update_icon_state() update_icon() @@ -180,7 +180,7 @@ item_flags = ABSTRACT | HAND_ITEM | DROPDEL var/strapon_type = "human" //Default var, but we always getting var from strapon_type from item on top -/obj/item/strapon_dildo/Initialize() +/obj/item/strapon_dildo/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm index cf53cbbe858..fc255a5ad91 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm @@ -63,7 +63,7 @@ update_icon() update_icon_state() -/obj/item/clothing/sextoy/eggvib/Initialize() +/obj/item/clothing/sextoy/eggvib/Initialize(mapload) . = ..() update_icon_state() update_icon() @@ -156,7 +156,7 @@ /// The default frequency of the toy var/frequency = FREQ_ELECTROPACK -/obj/item/clothing/sextoy/eggvib/signalvib/Initialize() +/obj/item/clothing/sextoy/eggvib/signalvib/Initialize(mapload) if(random) code = rand(1, 100) frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm index ca0efdc24d5..053ae7272a5 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm @@ -69,7 +69,7 @@ update_icon() form_changed = TRUE -/obj/item/clothing/sextoy/buttplug/Initialize() +/obj/item/clothing/sextoy/buttplug/Initialize(mapload) . = ..() set_light(0) update_light() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm index de2e460636a..30611563747 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm @@ -24,7 +24,7 @@ . = ..() AddElement(/datum/element/update_icon_updates_onmob) -/obj/item/clothing/sextoy/nipple_clamps/Initialize() +/obj/item/clothing/sextoy/nipple_clamps/Initialize(mapload) . = ..() update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm index 2e5505d2ff6..ddc41486647 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm @@ -13,7 +13,7 @@ /// The current color of the condom, can be changed and affects sprite var/current_color = "pink" -/obj/item/condom_pack/Initialize() +/obj/item/condom_pack/Initialize(mapload) . = ..() //color chosen randomly when item spawned current_color = "pink" @@ -55,7 +55,7 @@ var/condom_state = "unused" slot_flags = ITEM_SLOT_PENIS -/obj/item/clothing/sextoy/condom/Initialize() +/obj/item/clothing/sextoy/condom/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index c044ac0cbd6..c2f16a97d43 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -53,7 +53,7 @@ update_icon() color_changed = TRUE -/obj/item/clothing/sextoy/dildo/Initialize() +/obj/item/clothing/sextoy/dildo/Initialize(mapload) . = ..() update_icon_state() update_icon() @@ -264,7 +264,7 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors var/obj/item/clothing/sextoy/dildo_side/the_toy change_sprite = FALSE -/obj/item/clothing/sextoy/dildo/double_dildo/Initialize() +/obj/item/clothing/sextoy/dildo/double_dildo/Initialize(mapload) . = ..() update_action_buttons_icons() @@ -402,7 +402,7 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors item_flags = ABSTRACT | HAND_ITEM side_double = TRUE -/obj/item/clothing/sextoy/dildo_side/dildo/Initialize() +/obj/item/clothing/sextoy/dildo_side/dildo/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, STRAPON_TRAIT) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm index 96cfc031ed5..ac428f7824d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm @@ -25,7 +25,7 @@ "red" = image (icon = src.icon, icon_state = "[initial(icon_state)]_red"), "yellow" = image(icon = src.icon, icon_state = "[initial(icon_state)]_yellow")) -/obj/item/clothing/sextoy/fleshlight/Initialize() +/obj/item/clothing/sextoy/fleshlight/Initialize(mapload) . = ..() update_icon() update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm index 51c4a1f573b..e3faf680f6f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm @@ -23,7 +23,7 @@ /obj/item/kinky_shocker/get_cell() return cell -/obj/item/kinky_shocker/Initialize() +/obj/item/kinky_shocker/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm index 8462f1fd83d..de616eed2a0 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm @@ -129,7 +129,7 @@ return FALSE return TRUE -/obj/item/clothing/mask/leatherwhip/Initialize() +/obj/item/clothing/mask/leatherwhip/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm index af2b7978c39..dedbbb86ad1 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm @@ -33,7 +33,7 @@ if(!isinhands) . += magicwand_overlay -/obj/item/clothing/sextoy/magic_wand/Initialize() +/obj/item/clothing/sextoy/magic_wand/Initialize(mapload) . = ..() magicwand_overlay = mutable_appearance('modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_items/lewd_items.dmi', "magicwand", ABOVE_MOB_LAYER + 0.1) //two arguments diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm index 8dbf91f68ba..8bf2a678ba0 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm @@ -83,7 +83,7 @@ . = ..() icon_state = "[initial(icon_state)]_[number_remaining]" -/obj/item/serviette_pack/Initialize() +/obj/item/serviette_pack/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm index 72c47a11b6f..79090d9e24a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm @@ -32,7 +32,7 @@ return FALSE return TRUE -/obj/item/spanking_pad/Initialize() +/obj/item/spanking_pad/Initialize(mapload) . = ..() update_icon() update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm index 0390dac1940..7f27870b28b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm @@ -45,7 +45,7 @@ return FALSE return TRUE -/obj/item/bdsm_candle/Initialize() +/obj/item/bdsm_candle/Initialize(mapload) . = ..() update_icon() update_icon_state() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm index 7c535c2399c..92fd8b4087a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm @@ -55,7 +55,7 @@ update_icon() color_changed = TRUE -/obj/item/clothing/sextoy/vibrator/Initialize() +/obj/item/clothing/sextoy/vibrator/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm index 07cc3ad0c53..75cadfcfd11 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm @@ -48,7 +48,7 @@ update_icon() color_changed = TRUE -/obj/item/clothing/sextoy/vibroring/Initialize() +/obj/item/clothing/sextoy/vibroring/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index 25a0f2d6f9c..632d575505e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -127,7 +127,7 @@ unbuckle_all_mobs() // Object initialization -/obj/structure/chair/milking_machine/Initialize() +/obj/structure/chair/milking_machine/Initialize(mapload) . = ..() machine_color = machine_color_list[1] @@ -1027,7 +1027,7 @@ var/current_color = "pink" // Default initialization -/obj/item/milking_machine/constructionkit/Initialize() +/obj/item/milking_machine/constructionkit/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm index 131a7159aba..a41ad975ed0 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_remove_erp_items.dm @@ -1,229 +1,229 @@ -/obj/item/storage/box/milking_kit/Initialize() +/obj/item/storage/box/milking_kit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/storage/box/xstand_kit/Initialize() +/obj/item/storage/box/xstand_kit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/storage/box/bdsmbed_kit/Initialize() +/obj/item/storage/box/bdsmbed_kit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/storage/box/strippole_kit/Initialize() +/obj/item/storage/box/strippole_kit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/storage/box/shibari_stand/Initialize() +/obj/item/storage/box/shibari_stand/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/paper/shibari_kit_instructions/Initialize() +/obj/item/paper/shibari_kit_instructions/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/sextoy/Initialize() +/obj/item/clothing/sextoy/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/mask/ballgag/Initialize() +/obj/item/clothing/mask/ballgag/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/reagent_containers/glass/lewd_filter/Initialize() +/obj/item/reagent_containers/glass/lewd_filter/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/mask/gas/bdsm_mask/Initialize() +/obj/item/clothing/mask/gas/bdsm_mask/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/suit/corset/Initialize() +/obj/item/clothing/suit/corset/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/head/domina_cap/Initialize() +/obj/item/clothing/head/domina_cap/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/storage/belt/erpbelt/Initialize() +/obj/item/storage/belt/erpbelt/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/glasses/hypno/Initialize() +/obj/item/clothing/glasses/hypno/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/shoes/latex_heels/domina_heels/Initialize() +/obj/item/clothing/shoes/latex_heels/domina_heels/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/gloves/ball_mittens/Initialize() +/obj/item/clothing/gloves/ball_mittens/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/gloves/ball_mittens_reinforced/Initialize() +/obj/item/clothing/gloves/ball_mittens_reinforced/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/Initialize() +/obj/item/clothing/suit/straight_jacket/kinky_sleepbag/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/ears/kinky_headphones/Initialize() +/obj/item/clothing/ears/kinky_headphones/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/glasses/blindfold/kinky/Initialize() +/obj/item/clothing/glasses/blindfold/kinky/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/neck/kink_collar/Initialize() +/obj/item/clothing/neck/kink_collar/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/lustwish_discount/Initialize() +/obj/item/lustwish_discount/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/tickle_feather/Initialize() +/obj/item/tickle_feather/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/mask/leatherwhip/Initialize() +/obj/item/clothing/mask/leatherwhip/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/kinky_shocker/Initialize() +/obj/item/kinky_shocker/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/condom_pack/Initialize() +/obj/item/condom_pack/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/under/stripper_outfit/Initialize() +/obj/item/clothing/under/stripper_outfit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/structure/pole/Initialize() +/obj/structure/pole/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/polepack/Initialize() +/obj/item/polepack/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/bdsm_bed_kit/Initialize() +/obj/item/bdsm_bed_kit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/structure/chair/x_stand/Initialize() +/obj/structure/chair/x_stand/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/x_stand_kit/Initialize() +/obj/item/x_stand_kit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/structure/chair/milking_machine/Initialize() +/obj/structure/chair/milking_machine/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/milking_machine/constructionkit/Initialize() +/obj/item/milking_machine/constructionkit/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/bdsm_candle/Initialize() +/obj/item/bdsm_candle/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/spanking_pad/Initialize() +/obj/item/spanking_pad/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/restraints/handcuffs/lewd/Initialize() +/obj/item/restraints/handcuffs/lewd/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/strapon_dildo/Initialize() +/obj/item/strapon_dildo/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/key/kink_collar/Initialize() +/obj/item/key/kink_collar/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/mind_controller/Initialize() +/obj/item/mind_controller/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/neck/mind_collar/Initialize() +/obj/item/clothing/neck/mind_collar/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/restraints/handcuffs/milker/Initialize() +/obj/item/restraints/handcuffs/milker/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/vending_refill/lustwish/Initialize() +/obj/item/vending_refill/lustwish/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/machinery/vending/dorms/Initialize() +/obj/machinery/vending/dorms/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/structure/bed/bdsm_bed/Initialize() +/obj/structure/bed/bdsm_bed/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL -/obj/item/clothing/strapon/Initialize() +/obj/item/clothing/strapon/Initialize(mapload) . = ..() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm index eabd5411603..58795c4a0fe 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm @@ -75,7 +75,7 @@ var/mob/living/carbon/human/current_mob = null //to make it have model when we constructing the thingy -/obj/structure/chair/x_stand/Initialize() +/obj/structure/chair/x_stand/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm index 2ca46c4ac0b..f23d6c72f60 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm @@ -69,7 +69,7 @@ update_icon() update_brightness() -/obj/structure/pole/Initialize() +/obj/structure/pole/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm index 85d26359396..2ad1b29cd66 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/lustwish.dm @@ -174,7 +174,7 @@ return FALSE return TRUE -/obj/machinery/vending/dorms/Initialize() +/obj/machinery/vending/dorms/Initialize(mapload) . = ..() update_icon_state() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm index ead0bcacdee..60298141f1e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm @@ -73,7 +73,7 @@ return FALSE return TRUE -/obj/item/pillow/Initialize() +/obj/item/pillow/Initialize(mapload) . = ..() update_icon_state() update_icon() @@ -176,7 +176,7 @@ buildstacktype = /obj/item/stack/sheet/cloth -/obj/structure/bed/pillow_tiny/Initialize() +/obj/structure/bed/pillow_tiny/Initialize(mapload) .=..() update_icon_state() update_icon() @@ -272,7 +272,7 @@ buildstacktype = /obj/item/stack/sheet/cloth -/obj/structure/chair/pillow_small/Initialize() +/obj/structure/chair/pillow_small/Initialize(mapload) update_icon() return ..() @@ -400,7 +400,7 @@ buildstacktype = /obj/item/stack/sheet/cloth -/obj/structure/bed/pillow_large/Initialize() +/obj/structure/bed/pillow_large/Initialize(mapload) update_icon() return ..() diff --git a/modular_skyrat/modules/mutants/code/mutant_species.dm b/modular_skyrat/modules/mutants/code/mutant_species.dm index 6363473e7b3..8aefebd3893 100644 --- a/modular_skyrat/modules/mutants/code/mutant_species.dm +++ b/modular_skyrat/modules/mutants/code/mutant_species.dm @@ -161,7 +161,7 @@ sharpness = NONE wound_bonus = -40 -/obj/item/mutant_hand/Initialize() +/obj/item/mutant_hand/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) diff --git a/modular_skyrat/modules/novaya_ert/code/rationpacks.dm b/modular_skyrat/modules/novaya_ert/code/rationpacks.dm index 0c35919dd2c..91e01f7314d 100644 --- a/modular_skyrat/modules/novaya_ert/code/rationpacks.dm +++ b/modular_skyrat/modules/novaya_ert/code/rationpacks.dm @@ -38,7 +38,7 @@ icon_state = "mre_package" illustration = null -/obj/item/storage/box/nri_rations/Initialize() +/obj/item/storage/box/nri_rations/Initialize(mapload) . = ..() atom_storage.max_slots = 7 diff --git a/modular_skyrat/modules/pollution/code/perfumes.dm b/modular_skyrat/modules/pollution/code/perfumes.dm index ff93c8ce2ea..69f3830b7c6 100644 --- a/modular_skyrat/modules/pollution/code/perfumes.dm +++ b/modular_skyrat/modules/pollution/code/perfumes.dm @@ -17,7 +17,7 @@ /// Whether we have a cap or not var/has_cap = TRUE -/obj/item/perfume/Initialize() +/obj/item/perfume/Initialize(mapload) . = ..() update_appearance() diff --git a/modular_skyrat/modules/pollution/code/pollution_initializations.dm b/modular_skyrat/modules/pollution/code/pollution_initializations.dm index 103613fa584..78fa537df28 100644 --- a/modular_skyrat/modules/pollution/code/pollution_initializations.dm +++ b/modular_skyrat/modules/pollution/code/pollution_initializations.dm @@ -1,16 +1,16 @@ -/obj/effect/decal/cleanable/greenglow/Initialize() +/obj/effect/decal/cleanable/greenglow/Initialize(mapload) . = ..() AddElement(/datum/element/pollution_emitter, /datum/pollutant/chemical_vapors, 10) -/obj/effect/decal/cleanable/vomit/Initialize() +/obj/effect/decal/cleanable/vomit/Initialize(mapload) . = ..() AddElement(/datum/element/pollution_emitter, /datum/pollutant/decaying_waste, 10) -/obj/effect/decal/cleanable/insectguts/Initialize() +/obj/effect/decal/cleanable/insectguts/Initialize(mapload) . = ..() AddElement(/datum/element/pollution_emitter, /datum/pollutant/decaying_waste, 10) -/obj/effect/decal/cleanable/garbage/Initialize() +/obj/effect/decal/cleanable/garbage/Initialize(mapload) . = ..() AddElement(/datum/element/pollution_emitter, /datum/pollutant/decaying_waste, 30) @@ -18,7 +18,7 @@ . = ..() AddElement(/datum/element/pollution_emitter, /datum/pollutant/decaying_waste, 30) -/obj/structure/moisture_trap/Initialize() +/obj/structure/moisture_trap/Initialize(mapload) . = ..() AddElement(/datum/element/pollution_emitter, /datum/pollutant/decaying_waste, 30) diff --git a/modular_skyrat/modules/reagent_forging/code/anvil.dm b/modular_skyrat/modules/reagent_forging/code/anvil.dm index d8b532ec9cc..fd480acb9d8 100644 --- a/modular_skyrat/modules/reagent_forging/code/anvil.dm +++ b/modular_skyrat/modules/reagent_forging/code/anvil.dm @@ -9,7 +9,7 @@ ///if on the mining zlevel, it is primitive and has a different icon var/primitive = FALSE -/obj/structure/reagent_anvil/Initialize() +/obj/structure/reagent_anvil/Initialize(mapload) . = ..() if(is_mining_level(z)) primitive = TRUE diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm index c49a53f1386..008c3e270ff 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge.dm @@ -99,7 +99,7 @@ if(reagent_forging) . += span_warning("[src] has a red tinge, it is ready to imbue chemicals into reagent objects.") -/obj/structure/reagent_forge/Initialize() +/obj/structure/reagent_forge/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) if(is_mining_level(z)) diff --git a/modular_skyrat/modules/reagent_forging/code/forge_clothing.dm b/modular_skyrat/modules/reagent_forging/code/forge_clothing.dm index 42f9d3b373d..d9636861f3c 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge_clothing.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge_clothing.dm @@ -10,7 +10,7 @@ resistance_flags = FIRE_PROOF armor = list(MELEE = 40, BULLET = 40, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 0, WOUND = 30) -/obj/item/clothing/suit/armor/reagent_clothing/Initialize() +/obj/item/clothing/suit/armor/reagent_clothing/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 4) AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_OCLOTHING) @@ -25,7 +25,7 @@ resistance_flags = FIRE_PROOF armor = list(MELEE = 40, BULLET = 40, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 0, WOUND = 30) -/obj/item/clothing/gloves/reagent_clothing/Initialize() +/obj/item/clothing/gloves/reagent_clothing/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 4) AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_GLOVES) @@ -40,7 +40,7 @@ resistance_flags = FIRE_PROOF armor = list(MELEE = 40, BULLET = 40, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 0, WOUND = 30) -/obj/item/clothing/head/helmet/reagent_clothing/Initialize() +/obj/item/clothing/head/helmet/reagent_clothing/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 4) AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_HEAD) @@ -57,7 +57,7 @@ resistance_flags = FIRE_PROOF can_be_tied = FALSE -/obj/item/clothing/shoes/chain_boots/Initialize() +/obj/item/clothing/shoes/chain_boots/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 2) AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_FEET) @@ -74,7 +74,7 @@ resistance_flags = FIRE_PROOF can_be_tied = FALSE -/obj/item/clothing/shoes/plated_boots/Initialize() +/obj/item/clothing/shoes/plated_boots/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 2) AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_FEET) @@ -90,7 +90,7 @@ resistance_flags = FIRE_PROOF can_be_tied = FALSE -/obj/item/clothing/shoes/horseshoe/Initialize() +/obj/item/clothing/shoes/horseshoe/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, 2) AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_FEET) @@ -102,7 +102,7 @@ inhand_icon_state = "sring" worn_icon_state = "sring" -/obj/item/clothing/gloves/ring/reagent_clothing/Initialize() +/obj/item/clothing/gloves/ring/reagent_clothing/Initialize(mapload) . = ..() AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_GLOVES) @@ -110,7 +110,7 @@ name = "reagent pet collar" desc = "A pet collar that is ready to be imbued." -/obj/item/clothing/neck/kink_collar/reagent_clothing/Initialize() +/obj/item/clothing/neck/kink_collar/reagent_clothing/Initialize(mapload) . = ..() AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_NECK) @@ -128,6 +128,6 @@ name = "reagent handcuffs" desc = "A pair of handcuffs that are ready to be imbued." -/obj/item/restraints/handcuffs/reagent_clothing/Initialize() +/obj/item/restraints/handcuffs/reagent_clothing/Initialize(mapload) . = ..() AddComponent(/datum/component/reagent_clothing, ITEM_SLOT_HANDCUFFED) diff --git a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm index a760a2a64d4..fcd2503f6ce 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm @@ -3,7 +3,7 @@ lefthand_file = 'modular_skyrat/modules/reagent_forging/icons/mob/forge_weapon_l.dmi' righthand_file = 'modular_skyrat/modules/reagent_forging/icons/mob/forge_weapon_r.dmi' -/obj/item/forging/reagent_weapon/Initialize() +/obj/item/forging/reagent_weapon/Initialize(mapload) . = ..() AddComponent(/datum/component/reagent_weapon) @@ -156,7 +156,7 @@ /obj/structure/reagent_crafting_bench ) -/obj/item/forging/reagent_weapon/hammer/Initialize() +/obj/item/forging/reagent_weapon/hammer/Initialize(mapload) . = ..() AddElement(/datum/element/kneejerk) @@ -181,7 +181,7 @@ max_integrity = 150 //over double that of a wooden one w_class = WEIGHT_CLASS_NORMAL -/obj/item/shield/riot/buckler/reagent_weapon/Initialize() +/obj/item/shield/riot/buckler/reagent_weapon/Initialize(mapload) . = ..() AddComponent(/datum/component/reagent_weapon) @@ -293,7 +293,7 @@ #undef INCREASE_BLOCK_CHANGE -/obj/item/forging/reagent_weapon/bokken/Initialize() +/obj/item/forging/reagent_weapon/bokken/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) diff --git a/modular_skyrat/modules/reagent_forging/code/water_basin.dm b/modular_skyrat/modules/reagent_forging/code/water_basin.dm index cfc93f0bd64..2a9936e9714 100644 --- a/modular_skyrat/modules/reagent_forging/code/water_basin.dm +++ b/modular_skyrat/modules/reagent_forging/code/water_basin.dm @@ -6,7 +6,7 @@ anchored = TRUE density = TRUE -/obj/structure/reagent_water_basin/Initialize() +/obj/structure/reagent_water_basin/Initialize(mapload) . = ..() if(is_mining_level(z)) icon_state = "primitive_water_basin" diff --git a/modular_skyrat/modules/roboclothes/code/wardrobes.dm b/modular_skyrat/modules/roboclothes/code/wardrobes.dm index b6cf8a52d41..63b6f790a93 100644 --- a/modular_skyrat/modules/roboclothes/code/wardrobes.dm +++ b/modular_skyrat/modules/roboclothes/code/wardrobes.dm @@ -1,4 +1,4 @@ -/obj/machinery/vending/wardrobe/robo_wardrobe/Initialize() +/obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload) products[/obj/item/storage/backpack/science/robo] = 3 products[/obj/item/storage/backpack/satchel/tox/robo] = 3 products[/obj/item/storage/backpack/duffelbag/robo] = 3 diff --git a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm index ae0b5facd07..824966ada3a 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm @@ -146,7 +146,7 @@ var/base_name = "" var/list/possible_types = list(AMMO_TYPE_LETHAL, AMMO_TYPE_HOLLOWPOINT, AMMO_TYPE_RUBBER, AMMO_TYPE_IHDF) -/obj/item/ammo_box/magazine/multi_sprite/Initialize() +/obj/item/ammo_box/magazine/multi_sprite/Initialize(mapload) . = ..() base_name = name name = "[base_name] [round_type]" diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm index 7e3663342ee..8f8674c44a5 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm @@ -203,7 +203,7 @@ worn_icon_state = "peacekeeperbelt" content_overlays = FALSE -/obj/item/storage/belt/security/peacekeeper/Initialize() +/obj/item/storage/belt/security/peacekeeper/Initialize(mapload) . = ..() atom_storage.max_slots = 5 atom_storage.set_holdable(list( @@ -246,7 +246,7 @@ content_overlays = FALSE custom_premium_price = PAYCHECK_CREW * 3 -/obj/item/storage/belt/security/webbing/peacekeeper/Initialize() +/obj/item/storage/belt/security/webbing/peacekeeper/Initialize(mapload) . = ..() atom_storage.max_slots = 7 atom_storage.set_holdable(list( diff --git a/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm b/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm index a9b55fe713d..24c8040cf0f 100644 --- a/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm +++ b/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm @@ -39,7 +39,7 @@ var/mob/living/silicon/robot/user // needed for process() var/animation_playing = FALSE -/obj/item/borg_shapeshifter/Initialize() +/obj/item/borg_shapeshifter/Initialize(mapload) . = ..() /obj/item/borg_shapeshifter/Destroy() diff --git a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_control.dm b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_control.dm index ff6f934f310..c59e146a090 100644 --- a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_control.dm +++ b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle_control.dm @@ -19,7 +19,7 @@ var/strength = 0 var/powered = FALSE -/obj/machinery/particle_accelerator/control_box/Initialize() +/obj/machinery/particle_accelerator/control_box/Initialize(mapload) . = ..() wires = new /datum/wires/particle_accelerator/control_box(src) connected_parts = list() diff --git a/modular_skyrat/modules/singularity_engine/code/singularity_effect.dm b/modular_skyrat/modules/singularity_engine/code/singularity_effect.dm index 01ac8b8b20b..9771fa0c626 100644 --- a/modular_skyrat/modules/singularity_engine/code/singularity_effect.dm +++ b/modular_skyrat/modules/singularity_engine/code/singularity_effect.dm @@ -9,7 +9,7 @@ pixel_y = -32 var/timeleft = 62 -/obj/effect/singularity_creation/Initialize() +/obj/effect/singularity_creation/Initialize(mapload) . = ..() if(timeleft) QDEL_IN(src, timeleft) diff --git a/modular_skyrat/modules/stone/code/ore_veins.dm b/modular_skyrat/modules/stone/code/ore_veins.dm index 9ee1c73f9fb..aba55fe3cda 100644 --- a/modular_skyrat/modules/stone/code/ore_veins.dm +++ b/modular_skyrat/modules/stone/code/ore_veins.dm @@ -24,7 +24,7 @@ /// Our original description to hold. We'll revert to this when switching between the ore vein being depleted and not. var/base_desc = "" -/obj/structure/ore_vein/Initialize() +/obj/structure/ore_vein/Initialize(mapload) . = ..() base_desc = desc if(random_sprite == TRUE) diff --git a/modular_skyrat/modules/tableflip/code/flipped_table.dm b/modular_skyrat/modules/tableflip/code/flipped_table.dm index a69378984e4..94157366ae2 100644 --- a/modular_skyrat/modules/tableflip/code/flipped_table.dm +++ b/modular_skyrat/modules/tableflip/code/flipped_table.dm @@ -11,7 +11,7 @@ /// Custom materials that the original table used, if any var/list/table_materials = list() -/obj/structure/flippedtable/Initialize() +/obj/structure/flippedtable/Initialize(mapload) . = ..() var/static/list/loc_connections = list( diff --git a/modular_skyrat/modules/tribal_extended/code/quiver.dm b/modular_skyrat/modules/tribal_extended/code/quiver.dm index 730a072bd5f..941e4045e10 100644 --- a/modular_skyrat/modules/tribal_extended/code/quiver.dm +++ b/modular_skyrat/modules/tribal_extended/code/quiver.dm @@ -6,7 +6,7 @@ icon_state = "quiverlazy" //codersprite worn_icon_state = "quiver" -/obj/item/storage/belt/quiver/Initialize() +/obj/item/storage/belt/quiver/Initialize(mapload) . = ..() atom_storage.max_slots = 15 atom_storage.numerical_stacking = TRUE diff --git a/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm b/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm index 972b3d9f911..1a595ac2d46 100644 --- a/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm +++ b/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm @@ -22,7 +22,7 @@ // Does it have multiple uses? 1 by default, set to INFINITE (so -1, not any lower) to not have it be consumed. var/uses = 1 -/obj/item/trim_token/Initialize() +/obj/item/trim_token/Initialize(mapload) . = ..() // Making sure we have actual paths to avoid issues if(length(valid_trims_paths)) diff --git a/modular_skyrat/modules/turretid/code/turret_id_system.dm b/modular_skyrat/modules/turretid/code/turret_id_system.dm index b367da3767f..bae950e5b08 100644 --- a/modular_skyrat/modules/turretid/code/turret_id_system.dm +++ b/modular_skyrat/modules/turretid/code/turret_id_system.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(turret_id_refs) /obj/machinery/porta_turret var/system_id //The ID for this turret -/obj/machinery/porta_turret/Initialize() +/obj/machinery/porta_turret/Initialize(mapload) . = ..() if(system_id) if(!GLOB.turret_id_refs[system_id]) diff --git a/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm b/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm index 1ef983c707e..5ea7c3a7d0c 100644 --- a/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm +++ b/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm @@ -66,7 +66,7 @@ max_integrity = 75 var/ini_dir -/obj/structure/wrestling_corner/Initialize() +/obj/structure/wrestling_corner/Initialize(mapload) . = ..() ini_dir = dir diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/strange_rock.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/strange_rock.dm index 09644a4efb6..4b855771f1f 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/strange_rock.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/strange_rock.dm @@ -36,7 +36,7 @@ ///The tier of the item that was chosen, 1-100 then 1-3 var/choose_tier -/obj/item/xenoarch/strange_rock/Initialize() +/obj/item/xenoarch/strange_rock/Initialize(mapload) . = ..() create_item() create_depth() diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_item.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_item.dm index c1d3cf1a84e..b171f811bda 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_item.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_item.dm @@ -5,7 +5,7 @@ ///Used to spawn the same relic var/magnified_number -/obj/item/xenoarch/useless_relic/Initialize() +/obj/item/xenoarch/useless_relic/Initialize(mapload) . = ..() magnified_number = rand(1,8) icon_state = "useless[magnified_number]" @@ -141,7 +141,7 @@ desc = "An animal that is long past its prime. It is possible to recover it. Can be swabbed to recover its original animal's remnant DNA." icon_state = "recover_animal" -/obj/item/xenoarch/broken_item/animal/Initialize() +/obj/item/xenoarch/broken_item/animal/Initialize(mapload) . = ..() var/pick_celltype = pick(CELL_LINE_TABLE_BEAR, CELL_LINE_TABLE_BLOBBERNAUT, diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm index d4f9b1ff84e..7951fcd1d24 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm @@ -21,7 +21,7 @@ efficiency += laser_part.rating process_speed = initial(process_speed) - (6 SECONDS * efficiency) -/obj/machinery/xenoarch/Initialize() +/obj/machinery/xenoarch/Initialize(mapload) . = ..() holding_storage = new /obj/item(src) diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm index 355d94c2c5c..327931b797c 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm @@ -179,7 +179,7 @@ content_overlays = FALSE custom_premium_price = PAYCHECK_CREW * 2 -/obj/item/storage/belt/utility/xenoarch/Initialize() +/obj/item/storage/belt/utility/xenoarch/Initialize(mapload) . = ..() atom_storage.max_total_storage = 100 atom_storage.max_slots = 15 @@ -208,7 +208,7 @@ var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it -/obj/item/storage/bag/xenoarch/Initialize() +/obj/item/storage/bag/xenoarch/Initialize(mapload) . = ..() atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC atom_storage.allow_quick_empty = TRUE @@ -261,7 +261,7 @@ icon_state = "adv_satchel" insert_speed = 0.1 SECONDS -/obj/item/storage/bag/xenoarch/adv/Initialize() +/obj/item/storage/bag/xenoarch/adv/Initialize(mapload) . = ..() atom_storage.max_slots = 50