This commit is contained in:
kevinz000
2020-05-08 22:40:07 -07:00
parent 4cd5e08902
commit e684c6e574
8 changed files with 16 additions and 14 deletions
@@ -108,7 +108,7 @@ Difficulty: Extremely Hard
icon_state = "ice_1"
damage = 20
armour_penetration = 100
speed = 10
pixels_per_second = TILES_TO_PIXELS(1)
homing_turn_speed = 30
damage_type = BURN
@@ -122,7 +122,7 @@ Difficulty: Extremely Hard
icon_state = "nuclear_particle"
damage = 5
armour_penetration = 100
speed = 4
pixels_per_second = TILES_TO_PIXELS(2.5)
damage_type = BRUTE
/obj/item/projectile/ice_blast
@@ -130,7 +130,7 @@ Difficulty: Extremely Hard
icon_state = "ice_2"
damage = 15
armour_penetration = 100
speed = 4
pixels_per_second = TILES_TO_PIXELS(2.5)
damage_type = BRUTE
/obj/item/projectile/ice_blast/on_hit(atom/target, blocked = FALSE)
@@ -184,7 +184,7 @@ Difficulty: Extremely Hard
if(!startloc || !endloc)
break
var/obj/item/projectile/ice_blast/P = new(startloc)
P.speed *= projectile_speed_multiplier
P.pixels_per_second *= projectile_speed_multiplier
P.preparePixelProjectile(endloc, startloc, null, angle + rand(-10, 10))
P.firer = firer
if(original)
@@ -200,7 +200,7 @@ Difficulty: Extremely Hard
if(!endloc)
break
var/obj/item/projectile/P = new /obj/item/projectile/snowball(startloc)
P.speed *= projectile_speed_multiplier
P.pixels_per_second *= projectile_speed_multiplier
P.preparePixelProjectile(endloc, startloc, null, rand(-spread, spread))
P.firer = src
if(target)
@@ -219,7 +219,7 @@ Difficulty: Extremely Hard
if(!endloc)
break
var/obj/item/projectile/P = new /obj/item/projectile/ice_blast(startloc)
P.speed *= projectile_speed_multiplier
P.pixels_per_second *= projectile_speed_multiplier
P.preparePixelProjectile(endloc, startloc, null, spread)
P.firer = src
if(target)
+2 -1
View File
@@ -337,6 +337,7 @@
return TRUE
return FALSE
/// one move is a tile.
/obj/item/projectile/proc/return_predicted_turf_after_moves(moves, forced_angle) //I say predicted because there's no telling that the projectile won't change direction/location in flight.
if(!trajectory && isnull(forced_angle) && isnull(Angle))
return FALSE
@@ -344,7 +345,7 @@
if(!current)
var/turf/T = get_turf(src)
current = new(T.x, T.y, T.z, pixel_x, pixel_y, isnull(forced_angle)? Angle : forced_angle, pixel_increment_amount || SSprojectiles.global_pixel_increment_amount)
var/datum/point/vector/v = current.return_vector_after_increments(moves * SSprojectiles.global_iterations_per_move)
var/datum/point/vector/v = current.return_vector_after_increments(TILES_TO_PIXELS(moves) / (pixel_increment_amount || SSprojectiles.global_pixel_increment_amount))
return v.return_turf()
/obj/item/projectile/proc/return_pathing_turfs_in_moves(moves, forced_angle)
+1 -1
View File
@@ -74,7 +74,7 @@
flag = "energy"
hitsound = 'sound/weapons/tap.ogg'
eyeblur = 0
speed = 0.6
pixels_per_second = TILES_TO_PIXELS(16.667)
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
light_color = LIGHT_COLOR_BLUE
tracer_type = /obj/effect/projectile/tracer/disabler
@@ -3,6 +3,7 @@
damage = 20
armour_penetration = 20
light_range = 3
pixels_per_Second = TILES_TO_PIXELS(16.667)
speed = 0.6
range = 35
light_color = LIGHT_COLOR_RED
@@ -39,7 +40,7 @@
armour_penetration = 20
movement_type = FLYING | UNSTOPPABLE
range = 20
speed = 0.8
pixels_per_second = TILES_TO_PIXELS(12.5)
light_range = 4
light_color = LIGHT_COLOR_RED
@@ -2,7 +2,7 @@
/obj/item/projectile/bullet/p50
name =".50 bullet"
speed = 0.4
pixels_per_second = TILES_TO_PIXELS(25)
damage = 70
knockdown = 100
dismemberment = 50
@@ -43,5 +43,5 @@
/obj/item/projectile/bullet/p50/penetrator/shuttle //Nukeop Shuttle Variety
icon_state = "gaussstrong"
damage = 25
speed = 0.3
pixels_per_second = TILES_TO_PIXELS(33.33)
range = 16
@@ -5,7 +5,7 @@
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
flag = "rad"
irradiate = 5000
speed = 0.4
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 @@
jitter = 20
hitsound = 'sound/weapons/taserhit.ogg'
range = 14
speed = 0.6
pixels_per_second = TILES_TO_PIXELS(16.667)
tracer_type = /obj/effect/projectile/tracer/stun
muzzle_type = /obj/effect/projectile/muzzle/stun
impact_type = /obj/effect/projectile/impact/stun
+1 -1
View File
@@ -435,7 +435,7 @@
damage = 15
damage_type = BURN
nodamage = 0
speed = 0.3
pixels_per_Second = TILES_TO_PIXELS(33.33)
flag = "magic"
var/tesla_power = 20000