diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 6a53af52426..51287eaf20b 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -117,6 +117,16 @@ tools = list(/obj/item/weapon/screwdriver) time = 5 +/datum/table_recipe/frag12 + name = "FRAG-12 Shell" + result = /obj/item/ammo_casing/shotgun/frag12 + reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, + /datum/reagent/glycerol = 5, + /datum/reagent/toxin/acid = 5, + /datum/reagent/toxin/acid/polyacid = 5,) + tools = list(/obj/item/weapon/screwdriver) + time = 5 + /datum/table_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index a53b80ca1ed..4cf1351fbf1 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -96,6 +96,12 @@ icon_state = "ishell" projectile_type = /obj/item/projectile/bullet/incendiary/shell +/obj/item/ammo_casing/shotgun/frag12 + name = "FRAG-12 slug" + desc = "A high explosive breaching round for a 12 gauge shotgun." + icon_state = "heshell" + projectile_type = /obj/item/projectile/bullet/frag12 + /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath name = "dragonsbreath shell" desc = "A shotgun shell which fires a spread of incendiary pellets." @@ -157,4 +163,4 @@ desc = "A cased high explosive grenade that can only be activated once fired out of a grenade launcher." caliber = "40mm" icon_state = "40mmHE" - projectile_type = /obj/item/projectile/bullet/a40mm \ No newline at end of file + projectile_type = /obj/item/projectile/bullet/a40mm diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index a359fb02159..337ccb32d8c 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -168,3 +168,14 @@ obj/item/projectile/kinetic/New() if(!gun) qdel(src) gun.create_portal(src) + + +/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0) + explosion(target, -1, 0, 2) + return 1 + + +/obj/item/projectile/bullet/frag12 + name ="explosive slug" + damage = 25 + weaken = 5 \ No newline at end of file diff --git a/config/admins.txt b/config/admins.txt index e888262a285..e484b955124 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -69,3 +69,4 @@ steelpoint = Game Master phil235 = Game Master xxnoob = Game Master tkdrg = Game Master +thunder12345 = Game Master diff --git a/html/changelogs/Thunder12345-grenade_slugs-6300.yml b/html/changelogs/Thunder12345-grenade_slugs-6300.yml new file mode 100644 index 00000000000..b77f4ef1665 --- /dev/null +++ b/html/changelogs/Thunder12345-grenade_slugs-6300.yml @@ -0,0 +1,6 @@ +author: Thunder12345 + +delete-after: True + +changes: + - rscadd: "Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological shell, using tablecrafting. Constructed using an unloaded technological tech shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and requires a screwdriver." diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 200bed93b1b..367ef6ee234 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ