From 5f21d00e6e0770d3aa7f8d6a889f4ef9dbabdc27 Mon Sep 17 00:00:00 2001 From: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Mon, 3 Jul 2023 08:54:18 -0400 Subject: [PATCH] Fixes some instances of improper init args Some Initializes already had mapload into account in their args, they just did not have it named 'mapload'. This meant that when I added it, there were 2 mapload args, so things after it would not be put in order (see: disposals). --- code/modules/hydroponics/grown/towercap.dm | 2 +- code/modules/hydroponics/seeds.dm | 2 +- code/modules/mob/living/simple_animal/friendly/mouse.dm | 2 +- code/modules/recycling/disposal/construction.dm | 2 +- yogstation/code/game/objects/items/crayons.dm | 2 +- yogstation/code/game/objects/items/implants/implant_gang.dm | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index ed2ee4cc604a..6788d8a548ad 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -219,7 +219,7 @@ return if(!has_buckled_mobs() && do_after(user, 5 SECONDS, src)) for(var/I in 1 to 5) - var/obj/item/grown/log/L = new /obj/item/grown/log(src.loc) + var/obj/item/grown/log/L = new /obj/item/grown/log(loc) L.pixel_x += rand(1,4) L.pixel_y += rand(1,4) if(can_buckle || grill) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 3d6bbf6b2ed9..dd79c06985da 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -36,7 +36,7 @@ var/weed_rate = 1 //If the chance below passes, then this many weeds sprout during growth var/weed_chance = 5 //Percentage chance per tray update to grow weeds -/obj/item/seeds/Initialize(mapload, loc, nogenes = 0) +/obj/item/seeds/Initialize(mapload, nogenes = 0) . = ..() pixel_x = rand(-8, 8) pixel_y = rand(-8, 8) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 1a6ac3f2152c..1a939259f0f5 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -267,7 +267,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) if(istype(F, /obj/item/reagent_containers/food/snacks/royalcheese)) evolve() if(istype(F, /obj/item/grown/bananapeel/bluespace)) - var/obj/item/grown/bananapeel/bluespace/B + var/obj/item/grown/bananapeel/bluespace/B = F var/teleport_radius = max(round(B.seed.potency / 10), 1) var/turf/T = get_turf(src) do_teleport(src, T, teleport_radius, channel = TELEPORT_CHANNEL_BLUESPACE) diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm index d2926a5e5643..7697a7036590 100644 --- a/code/modules/recycling/disposal/construction.dm +++ b/code/modules/recycling/disposal/construction.dm @@ -14,7 +14,7 @@ var/obj/pipe_type = /obj/structure/disposalpipe/segment var/pipename -/obj/structure/disposalconstruct/Initialize(mapload, loc, _pipe_type, _dir = SOUTH, flip = FALSE, obj/make_from) +/obj/structure/disposalconstruct/Initialize(mapload, _pipe_type, _dir = SOUTH, flip = FALSE, obj/make_from) . = ..() if(make_from) pipe_type = make_from.type diff --git a/yogstation/code/game/objects/items/crayons.dm b/yogstation/code/game/objects/items/crayons.dm index 67feba8f1cad..ddee748e0504 100644 --- a/yogstation/code/game/objects/items/crayons.dm +++ b/yogstation/code/game/objects/items/crayons.dm @@ -83,7 +83,7 @@ pre_noise = FALSE post_noise = TRUE -/obj/item/toy/crayon/spraycan/gang/Initialize(mapload, loc, datum/team/gang/G) +/obj/item/toy/crayon/spraycan/gang/Initialize(mapload, datum/team/gang/G) .=..() if(G) gang = G diff --git a/yogstation/code/game/objects/items/implants/implant_gang.dm b/yogstation/code/game/objects/items/implants/implant_gang.dm index d1e162b623bf..1b8fb748cec7 100644 --- a/yogstation/code/game/objects/items/implants/implant_gang.dm +++ b/yogstation/code/game/objects/items/implants/implant_gang.dm @@ -3,7 +3,7 @@ desc = "Makes you a gangster." var/datum/team/gang/gang -/obj/item/implant/gang/Initialize(mapload, loc, setgang) +/obj/item/implant/gang/Initialize(mapload, setgang) .=..() gang = setgang @@ -53,7 +53,7 @@ /obj/item/implanter/gang name = "implanter (gang)" -/obj/item/implanter/gang/Initialize(mapload, loc, gang) +/obj/item/implanter/gang/Initialize(mapload, gang) if(!gang) return INITIALIZE_HINT_QDEL imp = new /obj/item/implant/gang(src,gang)