From 72fcabe2d2fec7626698bc6bc4e0c86a12ee4970 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Thu, 30 May 2024 16:39:55 +0100 Subject: [PATCH] goddamn merge conflict --- code/modules/defenses/sentry.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index d95fe47f79a0..9eea05441d74 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -551,12 +551,10 @@ faction_group = FACTION_LIST_ARES_MARINE /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini/ares/Initialize() - . = ..() link_sentry() . = ..() /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini/ares/Destroy() - . = ..() delink_sentry() . = ..()