New Map Mining (#1935)

* Alpha Commit

* Alpha Commit

* Seconds

* Some Commit

* Final Commit

* Fixing minedrone synth ID

* Dance Fever

* Fixing Travis part 1

* Satisfying the demands

* Stuff

* Sub-final commit

* Sculpting update

* more sculpting. pr is 99% sculpting, in fact

* kkk

* brightness_off

* swjaugyuwvhuw
This commit is contained in:
LordFowl
2017-03-22 18:14:37 -04:00
committed by GitHub
parent a2fbcaa18b
commit 3c64b62c27
128 changed files with 3734 additions and 1079 deletions

View File

@@ -224,7 +224,7 @@
/obj/item/projectile/beam/megaglaive
name = "thermal lance"
icon_state = "megaglaive"
damage = 6
damage = 10
incinerate = 5
armor_penetration = 10
no_attack_log = 1
@@ -239,10 +239,27 @@
src.transform = effect_transform
..()
/obj/item/projectile/beam/megaglaive/on_impact(var/atom/A)
if(isturf(A))
if(istype(A, /turf/simulated/mineral))
if(prob(75)) //likely because its a mining tool
var/turf/simulated/mineral/M = A
if(prob(10))
M.GetDrilled(1)
else if(!M.emitter_blasts_taken)
M.emitter_blasts_taken += 1
else if(prob(33))
M.emitter_blasts_taken += 1
if(ismob(A))
var/mob/living/M = A
M.apply_effect(1, INCINERATE, 0)
explosion(A, -1, 0, 2)
..()
/obj/item/projectile/beam/thermaldrill
name = "thermal lance"
icon_state = "megaglaive"
damage = 3
damage = 5
no_attack_log = 1
muzzle_type = /obj/effect/projectile/solar/muzzle
@@ -254,7 +271,13 @@
if(istype(A, /turf/simulated/mineral))
if(prob(75)) //likely because its a mining tool
var/turf/simulated/mineral/M = A
M.GetDrilled()
if(prob(33))
M.GetDrilled(1)
else if(!M.emitter_blasts_taken)
M.emitter_blasts_taken += 2
else if(prob(66))
M.emitter_blasts_taken += 2
if(ismob(A))
var/mob/living/M = A
M.apply_effect(1, INCINERATE, 0)