From 5aeef22b2f4449e3953fdc06cc0519841f5fdfa1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 13 Nov 2021 14:02:30 +0000 Subject: [PATCH] [MIRROR] Merge MACHINE/port_gen/Initialize definitions [MDB IGNORE] (#9429) * Merge MACHINE/port_gen/Initialize definitions (#62747) This apparently happened in 58d0f12c5c7, four year ago, where a New() was renamed to Initialize(). Apparently in this case, the second definition runs first, and the first definition runs in the second's parent call. Since the second immediately calls the first as a parent call, just merging them with the first's body first preserves behavior. This is slightly horrifying. * Merge MACHINE/port_gen/Initialize definitions Co-authored-by: esainane --- code/modules/power/port_gen.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index fb3ba9ee3eb..112d7922956 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -94,9 +94,6 @@ if(anchored) connect_to_network() -/obj/machinery/power/port_gen/pacman/Initialize(mapload) - . = ..() - var/obj/S = sheet_path sheet_name = initial(S.name)