Skip to content
This repository has been archived by the owner on Sep 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #4 from RemieRichards/2spooky3
Browse files Browse the repository at this point in the history
Eyeball migration
  • Loading branch information
gcoremans committed Oct 8, 2014
2 parents ae23274 + 980a0e5 commit 99ff426
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 1 deletion.
15 changes: 14 additions & 1 deletion code/modules/events/carp_migration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,17 @@
/datum/round_event/carp_migration/start()
for(var/obj/effect/landmark/C in landmarks_list)
if(C.name == "carpspawn")
new /mob/living/simple_animal/hostile/carp(C.loc)
new /mob/living/simple_animal/hostile/carp(C.loc)


//Eyeball migration
/datum/round_event_control/carp_migration/eyeballs
name = "Eyeball Migration"
typepath = /datum/round_event/carp_migration/eyeballs
weight = 0
earliest_start = 0

/datum/round_event/carp_migration/eyeballs/start()
for(var/obj/effect/landmark/C in landmarks_list)
if(C.name == "carpspawn")
new /mob/living/simple_animal/hostile/carp/eyeball(C.loc)
3 changes: 3 additions & 0 deletions code/modules/events/holiday/halloween.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@

spawn_meteors(5, meteorsSPOOKY)

var/datum/round_event_control/carp_migration/eyeballs/SpookyMigration = locate() in events.control
SpookyMigration.runEvent()

/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")
34 changes: 34 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/eyeballs.dm
Original file line number Diff line number Diff line change
@@ -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
Binary file modified icons/mob/animal.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 99ff426

Please sign in to comment.