From bdfd580f5fdc6801ea190f844aa7714e5d803bbc Mon Sep 17 00:00:00 2001 From: Razgriz Date: Thu, 17 Feb 2022 17:31:15 -0700 Subject: [PATCH] powder that makes you say yes --- code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm index d01d5984d5..df0a5c431e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm @@ -266,8 +266,6 @@ else M.visible_message("The petting was interrupted!!!", runemessage = "The petting was interrupted") return -<<<<<<< HEAD -======= /mob/living/simple_mob/vore/woof/hostile/aweful maxHealth = 100 @@ -317,4 +315,3 @@ projectiletype = /obj/item/projectile/awoo_missile projectilesound = 'sound/voice/long_awoo.ogg' ->>>>>>> 2e3393fca55... Merge pull request #12260 from Very-Soft/misctweaks