Merge pull request #7175 from atlantiscze/pewPEWPEWboom

[Ready To Merge] Emitter update

or how I might learn to love the revert button.
This commit is contained in:
Ccomp5950
2014-12-16 21:17:54 -05:00
6 changed files with 57 additions and 8 deletions

View File

@@ -14,6 +14,7 @@
var/mineral/mineral
var/mined_ore = 0
var/last_act = 0
var/emitter_blasts_taken = 0 // EMITTER MINING! Muhehe.
var/datum/geosample/geologic_data
var/excavation_level = 0
@@ -52,6 +53,16 @@
mined_ore = 2 //some of the stuff gets blown up
GetDrilled()
/turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj)
// Emitter blasts
if(istype(Proj, /obj/item/projectile/beam/emitter))
emitter_blasts_taken++
if(emitter_blasts_taken > 2) // 3 blasts per tile
mined_ore = 1
GetDrilled()
/turf/simulated/mineral/Bumped(AM)
. = ..()
if(istype(AM,/mob/living/carbon/human))