Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -375,3 +375,9 @@
 	desc = "A cap for children toys."
 	caliber = "caps"
 	projectile_type = /obj/item/projectile/bullet/cap
+
+/obj/item/ammo_casing/laser
+	desc = "An experimental laser casing."
+	caliber = "laser"
+	projectile_type = /obj/item/projectile/beam/laser
+	icon_state = "lasercasing"

code/modules/projectiles/ammunition/magazines.dm

@@ -437,3 +437,12 @@
 /obj/item/ammo_box/magazine/toy/m762/update_icon()
 	..()
 	icon_state = "a762-[round(ammo_count(),10)]"
+
+/obj/item/ammo_box/magazine/laser
+	name = "encased laser projector magazine"
+	desc = "Fits experimental laser ammo casings."
+	icon_state = "laser"
+	ammo_type = /obj/item/ammo_casing/laser
+	origin_tech = "combat=3"
+	caliber = "laser"
+	max_ammo = 20

code/modules/projectiles/guns/projectile/automatic.dm

@@ -249,3 +249,15 @@
 /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
 	..()
 	empty_alarm()
+
+/obj/item/weapon/gun/projectile/automatic/lasercarbine
+	name = "\improper IK-60 Laser Carbine"
+	desc = "An experimental carbine. Uses encased laser projectors as ammunition."//we need to uncouple the toroidal resistance dejammers
+	icon_state = "lasercarbine"
+	item_state = "laser"
+	w_class = 3
+	origin_tech = "combat=5;materials=5"
+	mag_type = /obj/item/ammo_box/magazine/laser
+	fire_sound = 'sound/weapons/emitter2.ogg'
+	can_suppress = 0
+	burst_size = 2