Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-07-19 22:05:31 +01:00
57 changed files with 2009 additions and 971 deletions

View File

@@ -63,7 +63,7 @@
icon_state = "emitter"
fire_sound = 'sound/weapons/emitter.ogg'
light_color = "#00CC33"
excavation_amount = 70 // 3 shots to mine a turf
excavation_amount = 140 // 2 shots to dig a standard rock turf. Superior due to being a mounted tool beam, to make it actually viable.
muzzle_type = /obj/effect/projectile/muzzle/emitter
tracer_type = /obj/effect/projectile/tracer/emitter