From 70fcf3898766eb0c071c95a40b96a6976fef65e8 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 7 Jul 2021 23:58:56 -0400 Subject: [PATCH] powder that makes you say yes --- code/game/objects/structures/ghost_pods/event_vr.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index db943999dc..eeca54e11c 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -52,15 +52,9 @@ "Webslinger Giant Spider" = /mob/living/simple_mob/animal/giant_spider/webslinger, "Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost, "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, -<<<<<<< HEAD "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, + "Weretiger" = /mob/living/simple_mob/vore/weretiger, "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred //CHOMPStation add. -||||||| parent of 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig - "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless -======= - "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, - "Weretiger" = /mob/living/simple_mob/vore/weretiger ->>>>>>> 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)