Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets

Gun Revamp 2: Gun Harder: Director's Cut

code/modules/projectiles/ammunition/bullets.dm

@@ -14,12 +14,6 @@
 	projectile_type = /obj/item/projectile/bullet/suffocationbullet
 
 
-/obj/item/ammo_casing/a75
-	desc = "A .75 bullet casing."
-	caliber = "75"
-	projectile_type = /obj/item/projectile/bullet/gyro
-
-
 /obj/item/ammo_casing/a666
 	desc = "A .666 bullet casing."
 	caliber = "357"
@@ -57,20 +51,21 @@
 
 
 /obj/item/ammo_casing/shotgun
-	name = "shotgun shell"
-	desc = "A 12 gauge shell."
-	icon_state = "gshell"
+	name = "shotgun slug"
+	desc = "A 12 gauge slug."
+	icon_state = "blshell"
 	caliber = "shotgun"
 	projectile_type = /obj/item/projectile/bullet
 	m_amt = 12500
 
 
-/obj/item/ammo_casing/shotgun/blank
+/obj/item/ammo_casing/shotgun/buckshot
 	name = "shotgun shell"
-	desc = "A blank shell."
-	icon_state = "blshell"
-	projectile_type = null
-	m_amt = 250
+	desc = "A 12 gauge shell."
+	icon_state = "gshell"
+	projectile_type = /obj/item/projectile/bullet/pellet
+	pellets = 5
+	variance = 0.8
 
 
 /obj/item/ammo_casing/shotgun/beanbag
@@ -106,6 +101,24 @@
 	return
 
 /obj/item/ammo_casing/a762
-	desc = "A 7.62 bullet casing."
+	desc = "A 7.62mm bullet casing."
 	caliber = "a762"
-	projectile_type = /obj/item/projectile/bullet
+	projectile_type = /obj/item/projectile/bullet
+
+
+/obj/item/ammo_casing/caseless
+	desc = "A caseless bullet casing."
+
+
+/obj/item/ammo_casing/caseless/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, var/distro, var/quiet)
+	if (..())
+		loc = null
+		return 1
+	else
+		return 0
+
+
+/obj/item/ammo_casing/caseless/a75
+	desc = "A .75 bullet casing."
+	caliber = "75"
+	projectile_type = /obj/item/projectile/bullet/gyro

code/modules/projectiles/ammunition/energy.dm

@@ -0,0 +1,106 @@
+/obj/item/ammo_casing/energy
+	name = "energy weapon lens"
+	desc = "The part of the gun that makes the laser go pew"
+	caliber = "energy"
+	projectile_type = /obj/item/projectile/energy
+	var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot.
+	var/select_name = "energy"
+	var/mod_name = null
+	var/fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/ammo_casing/energy/laser
+	projectile_type = /obj/item/projectile/beam
+	select_name = "kill"
+
+/obj/item/ammo_casing/energy/laser/practice
+	projectile_type = /obj/item/projectile/practice
+	select_name = "practice"
+
+/obj/item/ammo_casing/energy/laser/scatter
+	projectile_type = /obj/item/projectile/beam/scatter
+	pellets = 5
+	variance = 0.8
+	select_name = "scatter"
+
+/obj/item/ammo_casing/energy/laser/heavy
+	projectile_type = /obj/item/projectile/beam/heavylaser
+	select_name = "anti-vehicle"
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+
+/obj/item/ammo_casing/energy/laser/pulse
+	projectile_type = /obj/item/projectile/beam/pulse
+	e_cost = 200
+	select_name = "DESTROY"
+	fire_sound = 'sound/weapons/pulse.ogg'
+
+/obj/item/ammo_casing/energy/laser/bluetag
+	projectile_type = /obj/item/projectile/bluetag
+	select_name = "bluetag"
+
+/obj/item/ammo_casing/energy/laser/redtag
+	projectile_type = /obj/item/projectile/redtag
+	select_name = "redtag"
+
+/obj/item/ammo_casing/energy/bolt
+	projectile_type = /obj/item/projectile/energy/bolt
+	select_name = "bolt"
+	fire_sound = 'sound/weapons/Genhit.ogg'
+
+/obj/item/ammo_casing/energy/bolt/large
+	projectile_type = /obj/item/projectile/energy/bolt/large
+	select_name = "heavy bolt"
+
+/obj/item/ammo_casing/energy/xray
+	projectile_type = /obj/item/projectile/beam/xray
+	e_cost = 50
+	fire_sound = 'sound/weapons/laser3.ogg'
+
+/obj/item/ammo_casing/energy/electrode
+	projectile_type = /obj/item/projectile/energy/electrode
+	select_name = "stun"
+	fire_sound = 'sound/weapons/taser.ogg'
+
+/obj/item/ammo_casing/energy/electrode/gun
+	fire_sound = 'sound/weapons/gunshot.ogg'
+
+/obj/item/ammo_casing/energy/ion
+	projectile_type = /obj/item/projectile/ion
+	select_name = "ion"
+	fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/ammo_casing/energy/declone
+	projectile_type = /obj/item/projectile/energy/declone
+	select_name = "declone"
+	fire_sound = 'sound/weapons/pulse3.ogg'
+
+/obj/item/ammo_casing/energy/mindflayer
+	projectile_type = /obj/item/projectile/beam/mindflayer
+	select_name = "MINDFUCK"
+	fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/ammo_casing/energy/flora
+	fire_sound = 'sound/effects/stealthoff.ogg'
+
+/obj/item/ammo_casing/energy/flora/yield
+	projectile_type = /obj/item/projectile/energy/florayield
+	select_name = "increase yield"
+	mod_name = "yield"
+
+/obj/item/ammo_casing/energy/flora/mut
+	projectile_type = /obj/item/projectile/energy/floramut
+	select_name = "induce mutations"
+	mod_name = "mut"
+
+/obj/item/ammo_casing/energy/temp
+	projectile_type = /obj/item/projectile/temp
+	select_name = "freeze"
+	e_cost = 250
+	fire_sound = 'sound/weapons/pulse3.ogg'
+
+/obj/item/ammo_casing/energy/temp/hot
+	projectile_type = /obj/item/projectile/temp/hot
+	select_name = "bake"
+
+/obj/item/ammo_casing/energy/meteor
+	projectile_type = /obj/item/projectile/meteor
+	select_name = "goddamn meteor"

code/modules/projectiles/ammunition/magazines.dm

@@ -15,7 +15,7 @@
 				boolets++
 		return boolets
 	else
-		return stored_ammo.len
+		return ..()
 
 /obj/item/ammo_box/magazine/internal/cylinder/rus357
 	name = "russian revolver cylinder"
@@ -23,6 +23,7 @@
 	ammo_type = /obj/item/ammo_casing/a357
 	caliber = "357"
 	max_ammo = 6
+	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/cylinder/rus357/New()
 	stored_ammo += new ammo_type(src)
@@ -40,13 +41,15 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	caliber = "shotgun"
 	max_ammo = 4
+	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/shotcom
 	name = "combat shotgun internal magazine"
 	desc = "Oh god, this shouldn't be here"
-	ammo_type = /obj/item/ammo_casing/shotgun
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
 	caliber = "shotgun"
 	max_ammo = 8
+	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/cylinder/dualshot
 	name = "double-barrel shotgun internal magazine"
@@ -54,6 +57,7 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 	caliber = "shotgun"
 	max_ammo = 2
+	multiload = 0
 
 ///////////EXTERNAL MAGAZINES////////////////
 /obj/item/ammo_box/magazine/m9mm
@@ -131,7 +135,7 @@
 /obj/item/ammo_box/magazine/m75
 	name = "magazine (.75)"
 	icon_state = "75"
-	ammo_type = /obj/item/ammo_casing/a75
+	ammo_type = /obj/item/ammo_casing/caseless/a75
 	caliber = "75"
 	multiple_sprites = 2
 	max_ammo = 8

code/modules/projectiles/ammunition/special.dm

@@ -0,0 +1,30 @@
+/obj/item/ammo_casing/magic
+	name = "magic casing"
+	desc = "I didn't even know magic needed ammo..."
+	projectile_type = /obj/item/projectile/magic
+
+/obj/item/ammo_casing/magic/change
+	projectile_type = /obj/item/projectile/magic/change
+
+/obj/item/ammo_casing/magic/animate
+	projectile_type = /obj/item/projectile/magic/animate
+
+/obj/item/ammo_casing/magic/heal
+	projectile_type = /obj/item/projectile/magic/resurrection
+
+/obj/item/ammo_casing/magic/death
+	projectile_type = /obj/item/projectile/magic/death
+
+/obj/item/ammo_casing/magic/teleport
+	projectile_type = /obj/item/projectile/magic/teleport
+
+/obj/item/ammo_casing/magic/door
+	projectile_type = /obj/item/projectile/magic/door
+
+/obj/item/ammo_casing/magic/fireball
+	projectile_type = /obj/item/projectile/magic/fireball
+
+/obj/item/ammo_casing/syringegun
+	name = "syringe gun spring"
+	desc = "A high-power spring that throws syringes."
+	projectile_type = null