Merge pull request #11981 from Fox-McCloud/lavaland-update

Major Lavaland Update
This commit is contained in:
Crazy Lemon
2019-08-16 22:22:49 -06:00
committed by GitHub
24 changed files with 605 additions and 355 deletions
+2 -13
View File
@@ -248,18 +248,6 @@
dismemberment = 20
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
/obj/item/projectile/plasma/New()
var/turf/proj_turf = get_turf(src)
if(!istype(proj_turf, /turf))
return
var/datum/gas_mixture/environment = proj_turf.return_air()
if(environment)
var/pressure = environment.return_pressure()
if(pressure < 30)
name = "full strength plasma blast"
damage *= 3
..()
/obj/item/projectile/plasma/on_hit(atom/target)
. = ..()
if(ismineralturf(target))
@@ -270,7 +258,8 @@
forcedodge = 0
/obj/item/projectile/plasma/adv
range = 6
damage = 7
range = 5
/obj/item/projectile/plasma/adv/mech
damage = 10