diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 069db8ea340..7a6e1c405e7 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -43,9 +43,9 @@ dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.
" if(emagged) - dat += "(Begin Atmospheric Burn Simulation)
" +/* dat += "(Begin Atmospheric Burn Simulation)
" dat += "Ensure the holodeck is empty before testing.
" - dat += "
" + dat += "
"*/ dat += "(Begin Wildlife Simulation)
" dat += "Ensure the holodeck is empty before testing.
" dat += "
" @@ -130,13 +130,13 @@ target = locate(/area/holodeck/source_plating) if(target) loadProgram(target) - +/* else if(href_list["burntest"]) if(!emagged) return target = locate(/area/holodeck/source_burntest) if(target) loadProgram(target) - +*/ else if(href_list["wildlifecarp"]) if(!emagged) return target = locate(/area/holodeck/source_wildlife) @@ -339,7 +339,7 @@ spawn(30) for(var/obj/effect/landmark/L in linkedholodeck) - if(L.name=="Atmospheric Test Start") +/* if(L.name=="Atmospheric Test Start") spawn(20) var/turf/T = get_turf(L) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread @@ -347,9 +347,9 @@ s.start() if(T) T.temperature = 5000 - T.hotspot_expose(50000,50000,1) + 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/holocarp(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 8a6c0ef14c5..e1d3af4d597 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -52,4 +52,13 @@ if(istype(L)) if(prob(15)) L.Weaken(3) - L.visible_message("\the [src] knocks down \the [L]!") \ No newline at end of file + L.visible_message("\the [src] knocks down \the [L]!") + + +/mob/living/simple_animal/hostile/carp/holocarp + icon_state = "holocarp" + icon_living = "holocarp" + +/mob/living/simple_animal/hostile/carp/holocarp/Die() + del(src) + return \ No newline at end of file diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 7b3bf87b7f1..ceeae46da7f 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ