From 0e680b38a50316bdfe9fbf8f4f571e8d22c83494 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Wed, 5 Jul 2023 10:14:43 +0200 Subject: [PATCH] missed conflict --- code/game/objects/structures/crates_lockers/largecrate_vr.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 6a9d9cbc1a..b3e86775b6 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -74,7 +74,6 @@ /mob/living/simple_mob/animal/space/alien/queen, // /mob/living/simple_mob/vore/otie/feral, // /mob/living/simple_mob/vore/otie/red, ->>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks /mob/living/simple_mob/vore/aggressive/corrupthound)) return ..()