Merge remote-tracking branch 'origin/master' into mining

This commit is contained in:
ACCount12
2015-03-31 18:31:12 +12:00
210 changed files with 3468 additions and 3055 deletions
+2 -9
View File
@@ -585,14 +585,7 @@
mouse_opacity = 1
faction = list("neutral")
a_intent = "harm"
min_oxy = 0
max_oxy = 0
min_tox = 0
max_tox = 0
min_co2 = 0
max_co2 = 0
min_n2 = 0
max_n2 = 0
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
wander = 0
idle_vision_range = 5
@@ -634,7 +627,7 @@
return
..()
/mob/living/simple_animal/hostile/mining_drone/Die()
/mob/living/simple_animal/hostile/mining_drone/death()
..()
visible_message("<span class='danger'>[src] is destroyed!</span>")
new /obj/effect/decal/cleanable/robot_debris(src.loc)