Lay groundwork for megafauna, and add Ashdragon.

Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
This commit is contained in:
Markolie
2016-10-23 23:15:57 +02:00
parent f110b9e6a5
commit 2e711d1337
122 changed files with 1650 additions and 776 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
var/area/A = get_area(src)
if(A)
var/image/alert_overlay = image('icons/effects/effects.dmi', "ghostalertsie")
notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, attack_not_jump = 1)
notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
narsie_spawn_animation()
@@ -37,6 +37,7 @@
src.energy = starting_energy
..()
processing_objects.Add(src)
poi_list |= src
for(var/obj/machinery/power/singularity_beacon/singubeacon in world)
if(singubeacon.active)
target = singubeacon
@@ -45,6 +46,7 @@
/obj/singularity/Destroy()
processing_objects.Remove(src)
poi_list.Remove(src)
singularities -= src
target = null
return ..()
@@ -64,6 +64,7 @@
/obj/machinery/power/supermatter_shard/New()
. = ..()
poi_list |= src
radio = new(src)
radio.listening = 0
investigate_log("has been created.", "supermatter")
@@ -71,8 +72,10 @@
/obj/machinery/power/supermatter_shard/Destroy()
investigate_log("has been destroyed.", "supermatter")
qdel(radio)
radio = null
if(radio)
qdel(radio)
radio = null
poi_list.Remove(src)
return ..()
/obj/machinery/power/supermatter_shard/proc/explode()
+5
View File
@@ -34,6 +34,8 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
var/produced_power
var/energy_to_raise = 32
var/energy_to_lower = -20
/obj/singularity/energy_ball/Destroy()
if(orbiting && istype(orbiting, /obj/singularity/energy_ball))
@@ -44,6 +46,8 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
for(var/ball in orbiting_balls)
var/obj/singularity/energy_ball/EB = ball
qdel(EB)
poi_list.Remove(src)
return ..()
@@ -125,6 +129,7 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
/obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
if(istype(target))
target.orbiting_balls += src
poi_list.Remove(src)
. = ..()