Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/modules/projectiles/guns/energy/altevian_vr.dm

@@ -0,0 +1,59 @@
+/obj/item/weapon/gun/energy/altevian
+	name = "Magneto-Electric Energy Projector"
+	desc = "A hand-held version of an energy weapon for the Altevian Hegemony. This one seems to be made for more proper civilian use with its reduced charge capacity, but ease of handling."
+	icon_state = "meep"
+	item_state = "meep"
+	fire_delay = 8
+	slot_flags = SLOT_BELT
+	w_class = ITEMSIZE_NORMAL
+	force = 5
+	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
+	matter = list(MAT_STEEL = 1000)
+	projectile_type = /obj/item/projectile/beam/meeplaser
+	charge_cost = 150
+
+/obj/item/weapon/gun/energy/altevian/large
+	name = "Proto-Reactive Beam Thruster"
+	desc = "A standard issue energy rifle seen for defensive purposes for a space faring rodent species. The beams are tuned for proper suppression."
+	icon_state = "altevian-pdw"
+	item_state = "altevian-pdw"
+	slot_flags = SLOT_BELT
+	w_class = ITEMSIZE_LARGE
+	force = 10
+	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 4)
+	matter = list(MAT_STEEL = 2000)
+	projectile_type = /obj/item/projectile/beam/meeplaser/strong
+	charge_cost = 300
+
+/obj/item/projectile/beam/meeplaser
+	name = "meep beam"
+	icon_state = "meep"
+	damage = 15
+	light_color = "#77A6E1"
+	hud_state = "laser_disabler"
+
+	muzzle_type = /obj/effect/projectile/muzzle/meeplaser
+	tracer_type = /obj/effect/projectile/tracer/meeplaser
+	impact_type = /obj/effect/projectile/impact/meeplaser
+
+/obj/item/projectile/beam/meeplaser/strong
+	name = "repeater beam"
+	damage = 35
+
+/obj/effect/projectile/muzzle/meeplaser
+	icon_state = "muzzle_meep"
+	light_range = 2
+	light_power = 0.5
+	light_color = "#77A6E1"
+
+/obj/effect/projectile/tracer/meeplaser
+	icon_state = "meep"
+	light_range = 2
+	light_power = 0.5
+	light_color = "#77A6E1"
+
+/obj/effect/projectile/impact/meeplaser
+	icon_state = "impact_meep"
+	light_range = 2
+	light_power = 0.5
+	light_color = "#77A6E1"

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

@@ -0,0 +1,39 @@
+/obj/item/weapon/gun/projectile/altevian
+	name = "Altevian Rivet Repeater"
+	desc = "An offensive weapon designed by the altevians that is used for decompression and maximizes structural damage while also serving as a good method of personnel damage."
+	magazine_type = /obj/item/ammo_magazine/sam48
+	allowed_magazines = list(/obj/item/ammo_magazine/sam48)
+	projectile_type = /obj/item/projectile/bullet/sam48
+	icon_state = "altevian-repeater"
+	item_state = "altevian-repeater"
+	caliber = ".48"
+	load_method = MAGAZINE
+
+/obj/item/weapon/gun/projectile/altevian/update_icon()
+	if(ammo_magazine)
+		icon_state = initial(icon_state)
+	else
+		icon_state = "[initial(icon_state)]-e"
+
+/obj/item/ammo_magazine/sam48
+	name = "ammo clip (SAM .48)"
+	icon_state = "sam48"
+	desc = "Standard Altevian Munition clip, caliber .48."
+	caliber = ".48"
+	ammo_type = /obj/item/ammo_casing/sam48
+	mag_type = MAGAZINE
+	matter = list(MAT_STEEL = 240)
+	max_ammo = 5
+	multiple_sprites = 1
+
+/obj/item/ammo_casing/sam48
+	desc = "A .48 bolt casing."
+	caliber = ".48"
+	projectile_type = /obj/item/projectile/bullet/sam48
+	matter = list(MAT_STEEL = 30)
+
+/obj/item/projectile/bullet/sam48
+	fire_sound = 'sound/weapons/gunshot4.ogg'
+	icon_state = "sam48"
+	damage = 49
+	hud_state = "pistol_special"

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

@@ -218,3 +218,19 @@
 	w_class = ITEMSIZE_NORMAL
 	force = 5
 	sawn_off = TRUE
+
+//Sjorgen Inertial Shotgun
+/obj/item/weapon/gun/projectile/shotgun/semi
+	name = "semi-automatic shotgun"
+	desc = "A shotgun with a simple, yet effective recoil inertia loading mechanism for semi-automatic fire. This gun uses 12 gauge ammunition."
+	description_fluff = "Looking back on yet another venerable design, Hedberg-Hammarstrom settled on a pattern of shotgun that both had the reliability of a well proven semi-automatic loading system in addition to a striking visual aesthetic that would be appealing to even the most discerning of firearm collectors."
+	icon_state = "sjorgen"
+	item_state = "shotgun"
+	w_class = ITEMSIZE_LARGE
+	caliber = "12g"
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+	slot_flags = SLOT_BACK
+	load_method = SINGLE_CASING
+	max_shells = 5
+	ammo_type = /obj/item/ammo_casing/a12g/beanbag
+