From afcf9431388c976727103a8ee39bd0868745aed3 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 11 Nov 2021 05:58:25 -0500 Subject: [PATCH 1/2] Adds catslug to maintpred options --- code/game/objects/structures/ghost_pods/event_vr.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index e63e3ad8fc..7cbbc1e5e5 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -54,7 +54,11 @@ "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, "Weretiger" = /mob/living/simple_mob/vore/weretiger, +<<<<<<< HEAD "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred //CHOMPStation add. +======= + "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug +>>>>>>> 48eec061ec... Merge pull request #11815 from Very-Soft/catslugmaintpred ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) From af8834894bc4d7924138aba00b47843cb0fddbc9 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Fri, 10 Dec 2021 00:55:04 -0700 Subject: [PATCH 2/2] powder that makes you say yes --- code/game/objects/structures/ghost_pods/event_vr.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 7cbbc1e5e5..1c51513859 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -54,11 +54,8 @@ "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, "Weretiger" = /mob/living/simple_mob/vore/weretiger, -<<<<<<< HEAD - "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred //CHOMPStation add. -======= + "Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred, //CHOMPStation add. "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug ->>>>>>> 48eec061ec... Merge pull request #11815 from Very-Soft/catslugmaintpred ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)