diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 93dce313019..51e0066bf64 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -18,5 +18,9 @@ spawn_meteors(5, meteorsSPOOKY) + for(var/obj/effect/landmark/C in landmarks_list) + if(C.name == "carpspawn") + new /mob/living/simple_animal/hostile/carp/eyeball(C.loc) + /datum/round_event/spooky/announce() priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE") diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm new file mode 100644 index 00000000000..46f2e679e22 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm @@ -0,0 +1,34 @@ + + +/mob/living/simple_animal/hostile/carp/eyeball + name = "eyeball" + desc = "An odd looking creature, it won't stop staring..." + icon_state = "eyeball" + icon_living = "eyeball" + icon_dead = "" + icon_gib = "" + meat_type = null + meat_amount = 0 + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "hits" + maxHealth = 45 + health = 45 + + harm_intent_damage = 15 + melee_damage_lower = 20 + melee_damage_upper = 25 + attacktext = "blinks at" + attack_sound = 'sound/weapons/pierce.ogg' + + faction = list("spooky") + + +/mob/living/simple_animal/hostile/carp/eyeball/FindTarget() + . = ..() + if(.) + emote("me", 1, "glares at [.]") + +/mob/living/simple_animal/hostile/carp/eyeball/Die() + qdel(src) + return \ No newline at end of file diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 6466f049aed..38baa0e2e0b 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 2c2a61f85cf..db6356d7ac6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1099,6 +1099,7 @@ #include "code\modules\mob\living\simple_animal\hostile\bear.dm" #include "code\modules\mob\living\simple_animal\hostile\carp.dm" #include "code\modules\mob\living\simple_animal\hostile\creature.dm" +#include "code\modules\mob\living\simple_animal\hostile\eyeballs.dm" #include "code\modules\mob\living\simple_animal\hostile\faithless.dm" #include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm" #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm"