From a66ef318a013859ca50d3a337bc036736c587de7 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Tue, 28 Sep 2021 14:15:11 -0500 Subject: [PATCH] Corrects mapload args that sprug up in the past few days (#61759) See #61623 . These were either merged after the prior PR, coded before the prior PR, or were made in between and not updated. --- code/game/objects/effects/spawners/random/random.dm | 2 +- code/game/objects/structures/flora.dm | 3 +-- code/modules/antagonists/gang/cellphone.dm | 3 +-- code/modules/mob/living/simple_animal/hostile/bees.dm | 3 +-- code/modules/research/server.dm | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/code/game/objects/effects/spawners/random/random.dm b/code/game/objects/effects/spawners/random/random.dm index 6685fe54bc3..ca43aa3fef7 100644 --- a/code/game/objects/effects/spawners/random/random.dm +++ b/code/game/objects/effects/spawners/random/random.dm @@ -110,7 +110,7 @@ var/list/spawned_table //list of all items "spawned" and how many var/list/stat_table //list of all items "spawned" and their occurrance probability -/obj/item/loot_table_maker/Initialize() +/obj/item/loot_table_maker/Initialize(mapload) . = ..() make_table() diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 9daff55beec..d052b884577 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -398,7 +398,7 @@ icon_state = "fern" trimmable = FALSE -/obj/item/kirbyplants/fern/Initialize() +/obj/item/kirbyplants/fern/Initialize(mapload) . = ..() AddElement(/datum/element/swabable, CELL_LINE_TABLE_ALGAE, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 5) @@ -502,4 +502,3 @@ /obj/structure/flora/rock/pile/largejungle/Initialize(mapload) . = ..() icon_state = "[initial(icon_state)][rand(1,3)]" - diff --git a/code/modules/antagonists/gang/cellphone.dm b/code/modules/antagonists/gang/cellphone.dm index d5413f309c9..36035133475 100644 --- a/code/modules/antagonists/gang/cellphone.dm +++ b/code/modules/antagonists/gang/cellphone.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(gangster_cell_phones) var/gang_id = "Grove Street Families" var/activated = FALSE -/obj/item/gangster_cellphone/Initialize() +/obj/item/gangster_cellphone/Initialize(mapload) . = ..() GLOB.gangster_cell_phones += src become_hearing_sensitive() @@ -58,4 +58,3 @@ GLOBAL_LIST_EMPTY(gangster_cell_phones) if(HAS_TRAIT(cellphone_hearer, TRAIT_DEAF)) continue to_chat(cellphone_hearer, span_gangradio("[speaker.name] \[CELL: [gang_id]\] says, \"[message]\"")) - diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 07c47e7a128..6d146d26a29 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -324,7 +324,7 @@ to_chat(user, span_warning("You don't have enough units of that chemical to modify the bee's DNA!")) ..() -/obj/item/queen_bee/Initialize() +/obj/item/queen_bee/Initialize(mapload) . = ..() AddElement(/datum/element/swabable, CELL_LINE_TABLE_QUEEN_BEE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) @@ -369,4 +369,3 @@ var/mutable_appearance/body_overlay = mutable_appearance(icon = icon, icon_state = "bee_item_overlay") body_overlay.color = beegent ? beegent.color : BEE_DEFAULT_COLOUR . += body_overlay - diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 204fa45e1bf..f4c263ba3ae 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -206,7 +206,7 @@ var/front_panel_screws = 4 var/hdd_wires = 6 -/obj/machinery/rnd/server/master/Initialize() +/obj/machinery/rnd/server/master/Initialize(mapload) . = ..() name = "\improper Master " + name source_code_hdd = new(src)