Fixes null sound assert fails

This commit is contained in:
Sood
2016-03-23 06:51:03 -07:00
parent 34a1e96514
commit 49d6d1b76a
5 changed files with 25 additions and 21 deletions

View File

@@ -69,12 +69,12 @@
pod.dir = src.dir
to_chat(user, "<span class='notice'>You strut the pod frame together.</span>")
R.use(10)
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
for(var/obj/item/pod_parts/pod_frame/F in linkedparts)
if(1 == turn(F.dir, -F.link_angle)) //if the part links north during construction, as the bottom left part always does
//log_admin("Repositioning")
pod.loc = F.loc
qdel(F)
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
if(iswrench(O))
to_chat(user, "<span class='notice'>You [!anchored ? "secure \the [src] in place." : "remove the securing bolts."]</span>")
anchored = !anchored

View File

@@ -19,16 +19,17 @@
var/turf/location = get_turf(loc)
if(location)
location.hotspot_expose(1000,1000,surfaces=istype(loc,/turf))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
if (istype(src.loc,/obj/item/device/assembly_holder))
if (istype(src.loc.loc, /obj/structure/reagent_dispensers/fueltank/))
var/obj/structure/reagent_dispensers/fueltank/tank = src.loc.loc
if (tank && tank.modded)
tank.explode()
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
return 1

View File

@@ -38,14 +38,16 @@
/datum/event/rogue_drone/end()
var/num_recovered = 0
for(var/mob/living/simple_animal/hostile/retaliate/malf_drone/D in drones_list)
var/locc = get_turf(D)
if(locc)
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(3, 0, D.loc)
sparks.set_up(3, 0, locc)
sparks.start()
D.z = 2
D.has_loot = 0
drones_list -= D
qdel(D)
D = null
num_recovered++
if(num_recovered > drones_list.len * 0.75)

View File

@@ -1348,9 +1348,8 @@ datum
for(var/i = 1, i <= 5, i++)
var/chosen = pick(critters)
var/mob/living/simple_animal/hostile/C = new chosen
var/mob/living/simple_animal/hostile/C = new chosen(get_turf(holder.my_atom))
C.faction = "slimesummon"
C.loc = get_turf(holder.my_atom)
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(C, pick(NORTH,SOUTH,EAST,WEST))

View File

@@ -199,14 +199,16 @@
browserdatum.set_content(out)
browserdatum.open()
/obj/machinery/computer/telescience/proc/sparks()
if(telepad)
var/L = get_turf(E)
/obj/machinery/computer/telescience/proc/sparks(var/atom/target)
if(!target)
if(telepad && get_turf(telepad))
target = telepad
else
return
var/L = get_turf(target)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, L)
s.start()
else
return
/obj/machinery/computer/telescience/proc/telefail()
if(prob(95))
@@ -218,7 +220,7 @@
// Irradiate everyone in telescience!
for(var/obj/machinery/telepad/E in machines)
var/L = get_turf(E)
sparks()
sparks(target = L)
for(var/mob/living/carbon/human/M in viewers(L, null))
M.apply_effect((rand(10, 20)), IRRADIATE, 0)
to_chat(M, "<span class='warning'>You feel strange.</span>")
@@ -266,7 +268,7 @@
M.Paralyse(4)
else
M.Jitter(500)
sparks()
sparks(target = M)
return
if(prob(1))
// They did the mash! (They did the monster mash!) The monster mash! (It was a graveyard smash!)