Merge pull request #10835 from Ghommie/Ghommie-cit546

Something about runtime errors.
This commit is contained in:
kevinz000
2020-02-02 16:31:15 -07:00
committed by GitHub
4 changed files with 10 additions and 6 deletions
+1 -1
View File
@@ -109,4 +109,4 @@
/obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM)
set waitfor = FALSE
monitor.hasprox_receiver.HasProximity(AM)
monitor?.hasprox_receiver.HasProximity(AM)
@@ -332,8 +332,8 @@
speak_chance *= 1.27 // 20 crackers to go from 1% to 100%
speech_shuffle_rate += 10
to_chat(user, "<span class='notice'>[src] eagerly devours the cracker.</span>")
..()
return
return // the cracker was deleted
return ..()
//Bullets
/mob/living/simple_animal/parrot/bullet_act(obj/item/projectile/Proj)
@@ -59,7 +59,12 @@
/obj/effect/accelerated_particle/proc/move()
if(!step(src,dir))
forceMove(get_step(src,dir))
var/turf/T = get_step(src,dir)
if(T)
forceMove(T)
else
qdel(src)
return
movement_range--
if(movement_range == 0)
qdel(src)