diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index d059e310..72533e80 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -370,7 +370,7 @@ T.temperature = 5000 T.hotspot_expose(50000,50000,1) if(L.name=="Holocarp Spawn") - new /mob/living/simple_animal/hostile/carp(L.loc) + new /mob/living/simple_animal/hostile/carp/hologram(L.loc) /obj/machinery/computer/HolodeckControl/proc/emergencyShutdown() diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index e67a884e..d5512d32 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -66,4 +66,36 @@ icon_state = "critter" icon_living = "critter" icon_dead = "critter_dead" - attackv = "swoops" \ No newline at end of file + attackv = "swoops" + +// Holographic carp for the holodeck + +/mob/living/simple_animal/hostile/carp/hologram + name = "space carp" + desc = "A solid light image of a ferocious, fang-bearing creature resembling a fish. It flickers inconsistently but appears to be able to affect solid matter." + icon_state = "holocarp" + icon_living = "holocarp" + icon_dead = "carp_dead" + icon_gib = "carp_gib" + meat_type = null + var/datum/effect/effect/system/spark_spread/spark_system // for when they die + + +/mob/living/simple_animal/hostile/carp/hologram/New(loc) + . = ..(loc) + spark_system = new /datum/effect/effect/system/spark_spread() + spark_system.set_up(5, 0, src) + spark_system.attach(src) + + +/mob/living/simple_animal/hostile/carp/hologram/death() + src.spark_system.start() // sparks for holograms! Hurray! + stat = DEAD + density = 0 + . = ..() + src.visible_message("[src] sparks and then flickers out of existence.") + del(src) + + +/mob/living/simple_animal/hostile/carp/hologram/gib() + return death() \ No newline at end of file