Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/projectiles/projectile/beams.dm

@@ -146,6 +146,15 @@
 			if(M.wear_suit.type in suit_types)
 				M.adjustStaminaLoss(34)
 
+/obj/item/projectile/beam/lasertag/mag		//the projectile, compatible with regular laser tag armor
+	icon_state = "magjectile-toy"
+	name = "lasertag magbolt"
+	movement_type = FLYING | UNSTOPPABLE		//for penetration memes
+	range = 5		//so it isn't super annoying
+	light_range = 2
+	light_color = LIGHT_COLOR_YELLOW
+	eyeblur = 0
+
 /obj/item/projectile/beam/lasertag/redtag
 	icon_state = "laser"
 	suit_types = list(/obj/item/clothing/suit/bluetag)

code/modules/projectiles/projectile/bullets/ferromagnetic.dm

@@ -0,0 +1,49 @@
+/obj/item/projectile/bullet/magnetic
+	icon_state = "magjectile"
+	damage = 20
+	armour_penetration = 20
+	light_range = 3
+	speed = 0.6
+	range = 35
+	light_color = LIGHT_COLOR_RED
+
+/obj/item/projectile/bullet/magnetic/disabler
+	icon_state = "magjectile-nl" //nl stands for non-lethal
+	damage = 2
+	armour_penetration = 10
+	stamina = 20
+	light_color = LIGHT_COLOR_BLUE
+
+/obj/item/projectile/bullet/magnetic/weak
+	damage = 15
+	armour_penetration = 10
+	light_range = 2
+	range = 25
+
+/obj/item/projectile/bullet/magnetic/weak/disabler
+	damage = 2
+	stamina = 20
+
+/obj/item/projectile/bullet/magnetic/hyper
+	damage = 10
+	armour_penetration = 20
+	stamina = 10
+	movement_type = FLYING | UNSTOPPABLE
+	range = 6
+	light_range = 1
+	light_color = LIGHT_COLOR_RED
+
+/obj/item/projectile/bullet/incendiary/mag_inferno
+	icon_state = "magjectile-large"
+	damage = 10
+	armour_penetration = 20
+	movement_type = FLYING | UNSTOPPABLE
+	range = 20
+	speed = 0.8
+	light_range = 4
+	light_color = LIGHT_COLOR_RED
+
+/obj/item/projectile/bullet/incendiary/mag_inferno/on_hit(atom/target, blocked = FALSE)
+	..()
+	explosion(target, -1, 0, 0, 1, 2, flame_range = 2)
+	return BULLET_ACT_HIT

code/modules/projectiles/projectile/energy/ebow.dm

@@ -1,12 +1,14 @@
 /obj/item/projectile/energy/bolt //ebow bolts
 	name = "bolt"
 	icon_state = "cbbolt"
-	damage = 8
+	damage = 15
 	damage_type = TOX
 	nodamage = 0
-	knockdown = 100
-	stutter = 5
-	drowsy = 50
+	eyeblur = 10
+	slur = 5
+	knockdown = 160
+	stamina = 60
+	knockdown_stamoverride = 0
 
 /obj/item/projectile/energy/bolt/halloween
 	name = "candy corn"

code/modules/projectiles/projectile/reusable/foam_dart.dm

@@ -39,3 +39,10 @@
 	icon_state = "foamdart_riot_proj"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 	stamina = 25
+
+/obj/item/projectile/bullet/reusable/foam_dart/mag
+	name = "magfoam dart"
+	icon_state = "magjectile-toy"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
+	light_range = 2
+	light_color = LIGHT_COLOR_YELLOW