Merge pull request #12173 from kevinz000/projectiles_2

Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
parent a41a06bc4b 1f773cf4fe
commit ad57647e64
25 changed files with 178 additions and 99 deletions
@@ -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,7 +3,7 @@
 	damage = 20
 	armour_penetration = 20
 	light_range = 3
-	speed = 0.6
+	pixels_per_second = TILES_TO_PIXELS(16.667)
 	range = 35
 	light_color = LIGHT_COLOR_RED

@@ -39,7 +39,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
@@ -434,7 +434,7 @@
 	damage = 15
 	damage_type = BURN
 	nodamage = 0
-	speed = 0.3
+	pixels_per_second = TILES_TO_PIXELS(33.33)
 	flag = "magic"

 	var/zap_power = 20000
@@ -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