dragon's breath and HE shells (#25569)

* dragon's breath and HE shells

* ()

* fixes materials

* the power of copypaste

* numbers are HARD

code/game/machinery/ammolathe.dm

@@ -73,6 +73,8 @@
 		new /obj/item/ammo_storage/magazine/a12mm/ops/empty(), \
 		new /obj/item/ammo_storage/magazine/a75/empty(), \
 		new /obj/item/ammo_storage/box/a75(), \
+		new /obj/item/ammo_casing/shotgun/dragonsbreath(), \
+		new /obj/item/weapon/storage/box/dragonsbreathshells(), \
 		)
 	)
 

code/game/objects/items/weapons/storage/boxes.dm

@@ -601,7 +601,7 @@
 
 /obj/item/weapon/storage/box/lethalshells
 	name = "12-gauge slugs"
-	icon_state = "lethal shells"
+	icon_state = "slug_shells"
 	storage_slots = 16
 
 /obj/item/weapon/storage/box/lethalshells/New()
@@ -611,7 +611,7 @@
 
 /obj/item/weapon/storage/box/beanbagshells
 	name = "12-gauge beanbag shells"
-	icon_state = "bean bag shells"
+	icon_state = "beanbag_shells"
 	storage_slots = 16
 
 /obj/item/weapon/storage/box/beanbagshells/New()
@@ -621,7 +621,7 @@
 
 /obj/item/weapon/storage/box/stunshells
 	name = "12-gauge stun shells"
-	icon_state = "stun shells"
+	icon_state = "stun_shells"
 	storage_slots = 16
 
 /obj/item/weapon/storage/box/stunshells/New()
@@ -631,7 +631,7 @@
 
 /obj/item/weapon/storage/box/dartshells
 	name = "12-gauge darts"
-	icon_state = "dart shells"
+	icon_state = "dart_shells"
 	storage_slots = 16
 
 /obj/item/weapon/storage/box/dartshells/New()
@@ -641,13 +641,33 @@
 
 /obj/item/weapon/storage/box/buckshotshells
 	name = "12-gauge 00 buckshot shells"
-	icon_state = "lethal shells"
+	icon_state = "buckshot_shells"
 	storage_slots = 16
 
 /obj/item/weapon/storage/box/buckshotshells/New()
 	..()
 	for(var/i in 1 to 16)
 		new /obj/item/ammo_casing/shotgun/buckshot(src)
+		
+/obj/item/weapon/storage/box/dragonsbreathshells
+	name = "12-gauge dragon's breath shells"
+	icon_state = "dragonsbreath_shells"
+	storage_slots = 16
+
+/obj/item/weapon/storage/box/dragonsbreathshells/New()
+	..()
+	for(var/i in 1 to 16)
+		new /obj/item/ammo_casing/shotgun/dragonsbreath(src)
+		
+/obj/item/weapon/storage/box/fragshells
+	name = "12-gauge high-explosive fragmentation shells"
+	icon_state = "frag_shells"
+	storage_slots = 16		
+		
+/obj/item/weapon/storage/box/fragshells/New()
+	..()
+	for(var/i in 1 to 16)
+		new /obj/item/ammo_casing/shotgun/frag(src)
 
 /obj/item/weapon/storage/box/labels
 	name = "label roll box"

code/modules/projectiles/ammunition/bullets.dm

@@ -127,7 +127,6 @@
 	icon_state = "blshell"
 	projectile_type = /obj/item/projectile/bullet/blank
 	starting_materials = list(MAT_IRON = 250)
-	w_type = RECYK_METAL
 
 /obj/item/ammo_casing/shotgun/beanbag
 	name = "beanbag shell"
@@ -135,7 +134,6 @@
 	icon_state = "bshell"
 	projectile_type = /obj/item/projectile/bullet/weakbullet
 	starting_materials = list(MAT_IRON = 500)
-	w_type = RECYK_METAL
 
 /obj/item/ammo_casing/shotgun/fakebeanbag
 	name = "beanbag shell"
@@ -143,7 +141,6 @@
 	icon_state = "bshell"
 	projectile_type = /obj/item/projectile/bullet/weakbullet/booze
 	starting_materials = list(MAT_IRON = 12500)
-	w_type = RECYK_METAL
 
 /obj/item/ammo_casing/shotgun/stunshell
 	name = "stun shell"
@@ -151,7 +148,6 @@
 	icon_state = "stunshell"
 	projectile_type = /obj/item/projectile/bullet/stunshot
 	starting_materials = list(MAT_IRON = 2500)
-	w_type = RECYK_METAL
 
 /obj/item/ammo_casing/shotgun/dart
 	name = "shotgun dart"
@@ -159,7 +155,6 @@
 	icon_state = "blshell"
 	projectile_type = /obj/item/projectile/bullet/dart
 	starting_materials = list(MAT_IRON = 12500)
-	w_type = RECYK_METAL
 
 /obj/item/ammo_casing/shotgun/buckshot
 	name = "buckshot shell"
@@ -167,7 +162,21 @@
 	icon_state = "bsshell"
 	projectile_type = /obj/item/projectile/bullet/buckshot
 	starting_materials = list(MAT_IRON = 12500)
-	w_type = RECYK_METAL
+	
+/obj/item/ammo_casing/shotgun/dragonsbreath
+	name = "dragon's breath shell"
+	desc = "A 12 gauge shell filled with an incendiary mixture, for lighting up dark areas or setting things on fire."
+	icon_state = "bdbshell"
+	projectile_type = /obj/item/projectile/bullet/fire_plume/dragonsbreath
+	starting_materials = list(MAT_IRON = 500, MAT_PLASMA = 2000)
+	
+/obj/item/ammo_casing/shotgun/frag
+	name = "explosive shell"
+	desc = "A 12 gauge shell filled with a high-explosive mixture, for heavy anti-personnel usage."
+	icon_state = "fragshell"
+	projectile_type = /obj/item/projectile/bullet/boombullet
+	starting_materials = list(MAT_IRON = 500, MAT_PLASMA = 8000)
+	
 
 /obj/item/ammo_casing/a762
 	desc = "A 7.62x51mm bullet casing."

code/modules/projectiles/projectile/bullets.dm

@@ -185,13 +185,26 @@ obj/item/projectile/bullet/suffocationbullet
 	damage = 40
 	damage_type = TOX
 
-
 /obj/item/projectile/bullet/burstbullet
 	name = "exploding bullet"
+	embed = 0
+	damage = 0
 
 /obj/item/projectile/bullet/burstbullet/on_hit(var/atom/target, var/blocked = 0)
+	..()
 	explosion(target, 0,1,1,5)
 	qdel(src)
+	
+/obj/item/projectile/bullet/boombullet
+	name = "small exploding bullet"
+	embed = 0
+	damage = 0
+	penetration = -1
+
+/obj/item/projectile/bullet/boombullet/to_bump(var/atom/target)
+	..()
+	explosion(target, 0,0,1,5)
+	qdel(src)
 
 #define SPUR_FULL_POWER 4
 #define SPUR_HIGH_POWER 3
@@ -716,6 +729,24 @@ obj/item/projectile/bullet/suffocationbullet
 /obj/item/projectile/bullet/fire_plume/ex_act()
 	return
 
+/obj/item/projectile/bullet/fire_plume/dragonsbreath //for the shotgun shells
+	has_O2_in_mix = 0
+	max_range = 5
+	burn_strength = 0
+	burn_damage = 10
+	jet_pressure = 0
+	gas_jet = null
+	
+/obj/item/projectile/bullet/fire_plume/dragonsbreath/New()
+	..()
+	var/datum/gas_mixture/firemix = new /datum/gas_mixture
+	firemix.adjust_gas(GAS_PLASMA, 666)
+	gas_jet = firemix
+	jet_pressure = firemix.return_pressure()
+	gas_jet.temperature = 383.15
+	burn_strength = gas_jet.temperature
+
+
 /obj/item/projectile/bullet/mahoganut
 	name = "mahogany nut"
 	icon_state = "nut"

code/modules/research/designs/weapons.dm

@@ -361,10 +361,26 @@
 /datum/design/shotgun_shell/blank
 	name = "12ga. blank shell"
 	desc = "A blank 12-gauge shotgun shell that contains no projectile material."
-	id = "dartshell"
+	id = "blankshell"
 	build_type = AMMOLATHE
 	materials = list(MAT_IRON = 250)
 	build_path = /obj/item/ammo_casing/shotgun/blank
+	
+/datum/design/shotgun_shell/dragonsbreath
+	name = "12ga. dragon's breath shell"
+	desc = "A 12 gauge shell filled with an incendiary mixture, for lighting up dark areas or setting things on fire."
+	id = "dragonshell"
+	build_type = AMMOLATHE
+	materials = list(MAT_IRON = 500, MAT_PLASMA = 2000)
+	build_path = /obj/item/ammo_casing/shotgun/dragonsbreath
+	
+/datum/design/shotgun_shell/frag
+	name = "12ga. frag shell"
+	desc = "A 12 gauge shell filled with a high-explosive mixture, for heavy anti-personnel usage."
+	id = "fragshell"
+	build_type = AMMOLATHE
+	materials = list(MAT_IRON = 500, MAT_PLASMA = 8000)
+	build_path = /obj/item/ammo_casing/shotgun/frag
 
 //Box ammunition
 /datum/design/ammo_b380auto
@@ -462,6 +478,22 @@
 	build_type = AMMOLATHE
 	materials = list(MAT_IRON = 8000)
 	build_path = /obj/item/ammo_storage/box/flare
+	
+/datum/design/ammo_shotgun/dragonsbreath
+	name = "Ammunition box (12ga. dragon's breath)"
+	desc = "A box of 12-gauge dragon's breath shells."
+	id = "ammo_12ga_flare"
+	build_type = AMMOLATHE
+	materials = list(MAT_IRON = 8000, MAT_PLASMA = 32000)
+	build_path = /obj/item/weapon/storage/box/dragonsbreathshells
+	
+/datum/design/ammo_shotgun/frag
+	name = "Ammunition box (12ga. frag)"
+	desc = "A box of 12-gauge explosive shells."
+	id = "ammo_12ga_flare"
+	build_type = AMMOLATHE
+	materials = list(MAT_IRON = 8000, MAT_PLASMA = 128000)
+	build_path = /obj/item/weapon/storage/box/fragshells
 
 /datum/design/ammo_12mm
 	name = "Ammunition box (12mm)"