Merge pull request #4849 from VOREStation/upstream-merge-5978

[MIRROR] Unpicks some mining spaghetti
This commit is contained in:
Novacat
2019-03-28 22:01:36 -04:00
committed by GitHub
3 changed files with 90 additions and 69 deletions

View File

@@ -63,6 +63,7 @@
icon_state = "emitter"
fire_sound = 'sound/weapons/emitter.ogg'
light_color = "#00CC33"
excavation_amount = 70 // 3 shots to mine a turf
muzzle_type = /obj/effect/projectile/muzzle/emitter
tracer_type = /obj/effect/projectile/tracer/emitter
@@ -118,6 +119,7 @@
fire_sound = 'sound/weapons/emitter.ogg'
damage = 0 // The actual damage is computed in /code/modules/power/singularity/emitter.dm
light_color = "#00CC33"
excavation_amount = 70 // 3 shots to mine a turf
muzzle_type = /obj/effect/projectile/muzzle/emitter
tracer_type = /obj/effect/projectile/tracer/emitter