This commit is contained in:
kevinz000
2020-05-08 22:59:51 -07:00
parent e684c6e574
commit 6d6239a8b4
9 changed files with 15 additions and 10 deletions
@@ -417,7 +417,7 @@
marker.icon_state = "chronobolt"
marker.damage = bonus_value
marker.nodamage = FALSE
marker.speed = 2
marker.pixels_per_second = TILES_TO_PIXELS(5)
deadly_shot = FALSE
/obj/item/crusher_trophy/blaster_tubes/on_mark_detonation(mob/living/target, mob/living/user)
+2 -1
View File
@@ -448,7 +448,8 @@
else
return ..()
/obj/item/projectile/proc/set_pixel_speed(new_speed)
/obj/item/projectile/proc/set_pixel_increment_amount(new_speed)
pixel_increment_amount = new_speed
if(trajectory)
trajectory.set_speed(new_speed)
return TRUE
@@ -3,7 +3,7 @@
damage = 20
armour_penetration = 20
light_range = 3
pixels_per_Second = TILES_TO_PIXELS(16.667)
pixels_per_second = TILES_TO_PIXELS(16.667)
speed = 0.6
range = 35
light_color = LIGHT_COLOR_RED
@@ -5,7 +5,7 @@
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
flag = "rad"
irradiate = 5000
pixels_per_Second = TILES_TO_PIXELS(25)
pixels_per_second = TILES_TO_PIXELS(25)
hitsound = 'sound/weapons/emitter2.ogg'
impact_type = /obj/effect/projectile/impact/xray
var/static/list/particle_colors = list(
@@ -10,7 +10,7 @@
damage_type = BURN
damage = 10
knockdown = 20
speed = 2
pixels_per_second = TILES_TO_PIXELS(5)
range = 16
movement_type = FLYING | UNSTOPPABLE
var/datum/beam/arm