Skip to content

Commit

Permalink
goddamn merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed May 30, 2024
1 parent 75748b0 commit 72fcabe
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions code/modules/defenses/sentry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()

Expand Down

0 comments on commit 72fcabe

Please sign in to comment.