diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm
index f0bc34870b..24726b8058 100644
--- a/code/__DEFINES/maths.dm
+++ b/code/__DEFINES/maths.dm
@@ -210,4 +210,4 @@
 /// Make sure something is a boolean TRUE/FALSE 1/0 value, since things like bitfield & bitflag doesn't always give 1s and 0s.
 #define FORCE_BOOLEAN(x) ((x)? TRUE : FALSE)
 
-#define TILES_TO_PIXELS(tiles)			(tiles * world.icon_size)
+#define TILES_TO_PIXELS(tiles)			(tiles * PIXELS)
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 42095aba41..3b5b16d923 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -9,6 +9,9 @@
 #define TEXT_EAST			"[EAST]"
 #define TEXT_WEST			"[WEST]"
 
+/// world.icon_size
+#define PIXELS 32
+
 //These get to go at the top, because they're special
 //You can use these defines to get the typepath of the currently running proc/verb (yes procs + verbs are objects)
 /* eg:
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index abb2d12a1f..0b6f9c55c8 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -419,7 +419,7 @@
 	A.BB.damage = hitdamage
 	if(hitdamage)
 		A.BB.nodamage = FALSE
-	A.BB.speed = 0.5
+	A.BB.pixels_per_second = TILES_TO_PIXELS(20)
 	playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 	A.fire_casing(target, user, params, 0, 0, null, 0, src)
 	user.visible_message("<span class='warning'>[user] blasts a flying lollipop at [target]!</span>")
@@ -434,7 +434,7 @@
 	A.BB.damage = hitdamage
 	if(hitdamage)
 		A.BB.nodamage = FALSE
-	A.BB.speed = 0.5
+	A.BB.pixels_per_second = TILES_TO_PIXELS(20)
 	A.BB.color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
 	playsound(src.loc, 'sound/weapons/bulletflyby3.ogg', 50, 1)
 	A.fire_casing(target, user, params, 0, 0, null, 0, src)
@@ -671,13 +671,13 @@
 	if(track_projectile)
 		tracked[P] = P.damage
 	P.damage *= projectile_damage_coefficient
-	P.speed *= projectile_speed_coefficient
+	P.pixels_per_second *= projectile_speed_coefficient
 	P.add_overlay(projectile_effect)
 
 /obj/item/borg/projectile_dampen/proc/restore_projectile(obj/item/projectile/P)
 	tracked -= P
 	P.damage *= (1/projectile_damage_coefficient)
-	P.speed *= (1/projectile_speed_coefficient)
+	P.pixels_per_second *= (1/projectile_speed_coefficient)
 	P.cut_overlay(projectile_effect)
 
 /**********************************************************************
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 1fd1b31b69..dcd8e1a4ae 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -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)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 1992a02ca1..dac6e0c33f 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -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
diff --git a/code/modules/projectiles/projectile/bullets/ferromagnetic.dm b/code/modules/projectiles/projectile/bullets/ferromagnetic.dm
index 84b105c372..4f506a4de3 100644
--- a/code/modules/projectiles/projectile/bullets/ferromagnetic.dm
+++ b/code/modules/projectiles/projectile/bullets/ferromagnetic.dm
@@ -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
diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm
index ed98aa283c..6cbe258560 100644
--- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm
+++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm
@@ -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(
diff --git a/code/modules/projectiles/projectile/special/curse.dm b/code/modules/projectiles/projectile/special/curse.dm
index 99aa922622..d967540e6a 100644
--- a/code/modules/projectiles/projectile/special/curse.dm
+++ b/code/modules/projectiles/projectile/special/curse.dm
@@ -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
diff --git a/code/world.dm b/code/world.dm
index 344ca9be79..1a6be04bc1 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -9,6 +9,7 @@
 	hub = "Exadv1.spacestation13"
 	name = "/tg/ Station 13"
 	fps = 20
+	icon_size = PIXELS
 #ifdef FIND_REF_NO_CHECK_TICK
 	loop_checks = FALSE
 #endif