diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme index b1e0bd19291..cf2cac0df94 100644 --- a/mods/persistence/_persistence.dme +++ b/mods/persistence/_persistence.dme @@ -32,11 +32,11 @@ #include "controllers\subsystems\processing\specifications.dm" #include "datums\extensions\extensions.dm" #include "datums\extensions\holster.dm" -#include "datums\inventory_slots\_inventory_slot.dm" #include "datums\extensions\label.dm" #include "datums\extensions\lockable.dm" #include "datums\extensions\assembly\assembly.dm" #include "datums\extensions\eye\area_control.dm" +#include "datums\inventory_slots\_inventory_slot.dm" #include "datums\mind\mind.dm" #include "datums\music_tracks\blood_loss.dm" #include "datums\music_tracks\juno.dm" @@ -132,8 +132,9 @@ #include "modules\fabrication\_fabricator.dm" #include "modules\fabrication\fabricator_build.dm" #include "modules\fabrication\fabricator_intake.dm" -#include "modules\fabrication\designs\textile\space.dm" +#include "modules\fabrication\designs\protolathe\designs_ammunition.dm" #include "modules\fabrication\designs\protolathe\designs_weapons.dm" +#include "modules\fabrication\designs\textile\space.dm" #include "modules\hydroponics\grown.dm" #include "modules\hydroponics\grown_indedible.dm" #include "modules\hydroponics\seed_machines.dm" @@ -222,20 +223,31 @@ #include "modules\power\fuel_assembly\fuel_assembly.dm" #include "modules\power\fusion\fuel_injector.dm" #include "modules\projectiles\ammunition.dm" +#include "modules\projectiles\overrides.dm" +#include "modules\projectiles\ammunition\5.56\bullets.dm" +#include "modules\projectiles\ammunition\5.56\magazines.dm" +#include "modules\projectiles\ammunition\12g\bullets.dm" +#include "modules\projectiles\ammunition\12g\magazines.dm" +#include "modules\projectiles\ammunition\22_LR\bullets.dm" +#include "modules\projectiles\ammunition\22_LR\magazines.dm" +#include "modules\projectiles\ammunition\45\bullets.dm" +#include "modules\projectiles\ammunition\45\magazines.dm" #include "modules\projectiles\guns\projectile.dm" #include "modules\projectiles\guns\energy\tier0\lasrifle.dm" #include "modules\projectiles\guns\energy\tier1\laspistol.dm" #include "modules\projectiles\guns\energy\tier1\lasrifle.dm" #include "modules\projectiles\guns\projectile\tier0\boltaction.dm" +#include "modules\projectiles\guns\projectile\tier0\pistol.dm" #include "modules\projectiles\guns\projectile\tier0\revolver.dm" #include "modules\projectiles\guns\projectile\tier0\shotgun.dm" #include "modules\projectiles\guns\projectile\tier1\boltaction.dm" #include "modules\projectiles\guns\projectile\tier1\pistol.dm" #include "modules\projectiles\guns\projectile\tier1\pistol_gold.dm" +#include "modules\projectiles\guns\projectile\tier1\pistol_pocket.dm" #include "modules\projectiles\guns\projectile\tier1\revolver.dm" #include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm" +#include "modules\projectiles\guns\projectile\tier1\shotgun_db_sawn.dm" #include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm" -#include "modules\projectiles\overrides.dm" #include "modules\reagents\Chemistry-Holder.dm" #include "modules\reagents\chems\chems.dm" #include "modules\reagents\chems\recipes.dm" diff --git a/mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi b/mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi new file mode 100644 index 00000000000..77a394c7eb8 Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi b/mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi new file mode 100644 index 00000000000..6ef3562f6c9 Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi b/mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi new file mode 100644 index 00000000000..d2af21ce53c Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi b/mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi new file mode 100644 index 00000000000..f518903334f Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/22lr/tier0.dmi b/mods/persistence/icons/obj/ammunition/22lr/tier0.dmi new file mode 100644 index 00000000000..e595194c65b Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/22lr/tier0.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/22lr/tier1.dmi b/mods/persistence/icons/obj/ammunition/22lr/tier1.dmi new file mode 100644 index 00000000000..bda96d6ac35 Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/22lr/tier1.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/45/tier0.dmi b/mods/persistence/icons/obj/ammunition/45/tier0.dmi new file mode 100644 index 00000000000..fa451eab972 Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/45/tier0.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/45/tier1.dmi b/mods/persistence/icons/obj/ammunition/45/tier1.dmi new file mode 100644 index 00000000000..533747aefc8 Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/45/tier1.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/5.56/tier0.dmi b/mods/persistence/icons/obj/ammunition/5.56/tier0.dmi new file mode 100644 index 00000000000..8accdaef19f Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/5.56/tier0.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/5.56/tier1.dmi b/mods/persistence/icons/obj/ammunition/5.56/tier1.dmi new file mode 100644 index 00000000000..09e8d05a4c8 Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/5.56/tier1.dmi differ diff --git a/mods/persistence/icons/obj/ammunition/magazines.dmi b/mods/persistence/icons/obj/ammunition/magazines.dmi new file mode 100644 index 00000000000..a8b5e989fcf Binary files /dev/null and b/mods/persistence/icons/obj/ammunition/magazines.dmi differ diff --git a/mods/persistence/icons/obj/guns/tier0/pistol.dmi b/mods/persistence/icons/obj/guns/tier0/pistol.dmi new file mode 100644 index 00000000000..70972215a75 Binary files /dev/null and b/mods/persistence/icons/obj/guns/tier0/pistol.dmi differ diff --git a/mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi b/mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi new file mode 100644 index 00000000000..4d865103606 Binary files /dev/null and b/mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi differ diff --git a/mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi b/mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi new file mode 100644 index 00000000000..b2b9998977b Binary files /dev/null and b/mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi differ diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm new file mode 100644 index 00000000000..1896e70b598 --- /dev/null +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_ammunition.dm @@ -0,0 +1,35 @@ +/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier0 + path = /obj/item/ammo_magazine/fivefiftysix/handmade + +/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier0 + path = /obj/item/ammo_magazine/box/fivefiftysix/handmade + +/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/magazine/tier1 + path = /obj/item/ammo_magazine/fivefiftysix/simple + +/datum/fabricator_recipe/protolathe/ammunition/fivefiftysix/box/tier1 + path = /obj/item/ammo_magazine/box/fivefiftysix/simple + +/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier0 + path = /obj/item/ammo_magazine/twentytwolr/handmade + +/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier0 + path = /obj/item/ammo_magazine/box/twentytwolr/handmade + +/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/magazine/tier1 + path = /obj/item/ammo_magazine/twentytwolr/simple + +/datum/fabricator_recipe/protolathe/ammunition/twentytwolr/box/tier1 + path = /obj/item/ammo_magazine/box/twentytwolr/simple + +/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier0 + path = /obj/item/ammo_magazine/fortyfive/handmade + +/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier0 + path = /obj/item/ammo_magazine/box/fortyfive/handmade + +/datum/fabricator_recipe/protolathe/ammunition/fortyfive/magazine/tier1 + path = /obj/item/ammo_magazine/fortyfive/simple + +/datum/fabricator_recipe/protolathe/ammunition/fortyfive/box/tier1 + path = /obj/item/ammo_magazine/box/fortyfive/simple \ No newline at end of file diff --git a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm index f426b92c8cf..64771ea008d 100644 --- a/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm +++ b/mods/persistence/modules/fabrication/designs/protolathe/designs_weapons.dm @@ -4,6 +4,9 @@ /datum/fabricator_recipe/protolathe/weapon/tier0/revolver path = /obj/item/gun/projectile/revolver/handmade/empty +/datum/fabricator_recipe/protolathe/weapon/tier0/pistol + path = /obj/item/gun/projectile/pistol/handmade/empty + /datum/fabricator_recipe/protolathe/weapon/tier0/shotgun path = /obj/item/gun/projectile/shotgun/handmade/empty @@ -13,6 +16,9 @@ /datum/fabricator_recipe/protolathe/weapon/tier1/bolt_action path = /obj/item/gun/projectile/bolt_action/simple/empty +/datum/fabricator_recipe/protolathe/weapon/tier1/pistol_pocket + path = /obj/item/gun/projectile/pistol_pocket/simple/empty + /datum/fabricator_recipe/protolathe/weapon/tier1/pistol path = /obj/item/gun/projectile/pistol/simple/empty diff --git a/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm new file mode 100644 index 00000000000..6aa5e19889b --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/12g/bullets.dm @@ -0,0 +1,82 @@ +#define CALIBER_12G "12g" + +/obj/item/ammo_casing/twelvegauge + name = "generic 12g shell" + desc = "An unsettlingly generic 12g shell." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi' + caliber = CALIBER_12G + projectile_type = /obj/item/projectile/bullet/twelvegauge + +/obj/item/ammo_casing/twelvegauge/slug + name = "generic 12g slug shell" + desc = "An unsettlingly generic 12g slug shell." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi' + caliber = CALIBER_12G + projectile_type = /obj/item/projectile/bullet/twelvegauge + +/obj/item/projectile/bullet/twelvegauge + fire_sound = 'sound/weapons/gunshot/shotgun.ogg' + damage = 40 + distance_falloff = 3 + +/obj/item/ammo_casing/twelvegauge/buckshot + name = "generic 12g buckshot shell" + desc = "An unsettlingly generic 12g buckshot shell." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi' + caliber = CALIBER_12G + projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge + +/obj/item/projectile/bullet/pellet/twelvegauge + fire_sound = 'sound/weapons/gunshot/shotgun.ogg' + damage = 10 + pellets = 6 + range_step = 1 + spread_step = 10 + +/obj/item/ammo_casing/twelvegauge/slug/handmade + name = "makeshift 12g slug shell" + desc = "12g slug shell of dubious origin. Sports decent armor penetration capabilities and high damage, but suffers from poor range." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier0_slug.dmi' + projectile_type = /obj/item/projectile/bullet/twelvegauge/handmade + +/obj/item/projectile/bullet/twelvegauge/handmade + damage = 40 + distance_falloff = 5 + penetration_modifier = 1.1 + +/obj/item/ammo_casing/twelvegauge/buckshot/handmade + name = "makeshift 12g buckshot shell" + desc = "12g buckshot shell of dubious origin. Sports high damage, but suffers from poor armor penetration and very poor range." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier0_buckshot.dmi' + projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/handmade + +/obj/item/projectile/bullet/pellet/twelvegauge/handmade + damage = 10 + pellets = 6 + range_step = 1 + spread_step = 10 + penetration_modifier = 1.5 + +/obj/item/ammo_casing/twelvegauge/slug/simple + name = "standard 12g slug shell" + desc = "12g slug shell of ancient design. Sports decent armor penetration capabilities and high damage, but suffers from poor range." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_slug.dmi' + projectile_type = /obj/item/projectile/bullet/twelvegauge/simple + +/obj/item/projectile/bullet/twelvegauge/simple + damage = 60 + distance_falloff = 5 + penetration_modifier = 0.9 + +/obj/item/ammo_casing/twelvegauge/buckshot/simple + name = "standard 12g buckshot shell" + desc = "12g buckshot shell of ancient design. Sports high damage, but suffers from poor armor penetration and very poor range." + icon = 'mods/persistence/icons/obj/ammunition/12g/tier1_buckshot.dmi' + projectile_type = /obj/item/projectile/bullet/pellet/twelvegauge/simple + +/obj/item/projectile/bullet/pellet/twelvegauge/simple + damage = 15 + pellets = 6 + range_step = 1 + spread_step = 10 + penetration_modifier = 1.3 \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm new file mode 100644 index 00000000000..80b02aba78c --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/12g/magazines.dm @@ -0,0 +1,67 @@ +/obj/item/ammo_magazine/box/twelvegauge + name = "packet of generic 12g shells" + desc = "A packet of unsettlingly generic 12g shells." + icon_state = "box_12g1_slug" + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + material = /decl/material/solid/metal/steel + caliber = CALIBER_12G + ammo_type = /obj/item/ammo_casing/twelvegauge + max_ammo = 16 + +/obj/item/ammo_magazine/box/twelvegauge/slug + name = "packet of generic 12g slug shells" + desc = "A packet of unsettlingly generic 12g slug shells." + icon_state = "box_12g1_slug" + ammo_type = /obj/item/ammo_casing/twelvegauge/slug + +/obj/item/ammo_magazine/box/twelvegauge/buckshot + name = "packet of generic 12g buckshot shells" + desc = "A packet of unsettlingly generic 12g buckshot shells." + icon_state = "box_12g1_buckshot" + ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot + +/obj/item/ammo_magazine/box/twelvegauge/slug/handmade + name = "packet of makeshift 12g slug shells" + desc = "Container of dubious origin intended for holding loose 12g slug shells." + icon_state = "box_12g0_slug" + origin_tech = "{'combat':1,'materials':1}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade + +/obj/item/ammo_magazine/box/twelvegauge/buckshot/handmade + name = "packet of makeshift 12g buckshot shells" + desc = "Container of dubious origin intended for holding loose 12g buckshot shells." + icon_state = "box_12g0_buckshot" + origin_tech = "{'combat':1,'materials':1}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/handmade + +/obj/item/ammo_magazine/box/twelvegauge/slug/simple + name = "packet of standard 12g slug shells" + desc = "Container of ancient design intended for holding loose 12g slug shells." + icon_state = "box_12g1_slug" + origin_tech = "{'combat':2,'materials':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple + +/obj/item/ammo_magazine/box/twelvegauge/buckshot/simple + name = "packet of standard 12g buckshot shells" + desc = "Container of ancient design intended for holding loose 12g buckshot shells." + icon_state = "box_12g1_buckshot" + origin_tech = "{'combat':2,'materials':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twelvegauge/buckshot/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm new file mode 100644 index 00000000000..9e4e8b23cea --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/22_LR/bullets.dm @@ -0,0 +1,35 @@ +#define CALIBER_22LR ".22LR" + +/obj/item/ammo_casing/twentytwolr + name = "generic .22LR round" + desc = "An unsettlingly generic .22LR round." + icon = 'mods/persistence/icons/obj/ammunition/22lr/tier1.dmi' + caliber = CALIBER_22LR + projectile_type = /obj/item/projectile/bullet/twentytwolr + +/obj/item/projectile/bullet/twentytwolr + fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg' + damage = 10 + distance_falloff = 1 + +/obj/item/ammo_casing/twentytwolr/handmade + name = "makeshift .22LR round" + desc = ".22 Long Rifle round of dubious origin. Sports poor range and very poor armor penetration due to shoddy construction." + icon = 'mods/persistence/icons/obj/ammunition/22lr/tier0.dmi' + projectile_type = /obj/item/projectile/bullet/twentytwolr/handmade + +/obj/item/projectile/bullet/twentytwolr/handmade + damage = 15 + distance_falloff = 6 + penetration_modifier = 1.5 + +/obj/item/ammo_casing/twentytwolr/simple + name = "standard .22LR round" + desc = ".22 Long Rifle round of ancient design. Sports unimpressive range and poor armor penetration due to low velocity." + icon = 'mods/persistence/icons/obj/ammunition/22lr/tier1.dmi' + projectile_type = /obj/item/projectile/bullet/twentytwolr/simple + +/obj/item/projectile/bullet/twentytwolr/simple + damage = 25 + distance_falloff = 4 + penetration_modifier = 1.2 \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm new file mode 100644 index 00000000000..8f88b889a74 --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/22_LR/magazines.dm @@ -0,0 +1,66 @@ +/obj/item/ammo_magazine/twentytwolr + name = "generic .22LR magazine" + desc = "An unsettlingly generic .22LR magazine." + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + icon_state = "22lr1" + mag_type = MAGAZINE + caliber = CALIBER_22LR + material = /decl/material/solid/metal/steel + ammo_type = /obj/item/ammo_casing/twentytwolr + initial_ammo = 0 + max_ammo = 0 + multiple_sprites = 1 + +/obj/item/ammo_magazine/box/twentytwolr + name = "packet of generic .22LR rounds" + desc = "A packet of unsettlingly generic .22LR rounds." + icon_state = "box_22lr1" + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + material = /decl/material/solid/metal/steel + caliber = CALIBER_22LR + ammo_type = /obj/item/ammo_casing/twentytwolr + max_ammo = 30 + +/obj/item/ammo_magazine/twentytwolr/handmade + name = "makeshift .22LR magazine" + desc = ".22LR magazine of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship." + icon_state = "22lr0" + origin_tech = "{'combat':1}" + material = /decl/material/solid/plastic + ammo_type = /obj/item/ammo_casing/twentytwolr/handmade + max_ammo = 5 + +/obj/item/ammo_magazine/box/twentytwolr/handmade + name = "packet of makeshift .22LR rounds" + desc = "Container of dubious origin intended for holding loose .22LR rounds." + icon_state = "box_22lr0" + origin_tech = "{'combat':1,'materials':1}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twentytwolr/handmade + +/obj/item/ammo_magazine/twentytwolr/simple + name = "standard .22LR magazine" + desc = ".22LR magazine of ancient design. Servicable capacity, but outpaced by more modern designs." + icon_state = "22lr1" + origin_tech = "{'combat':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT + ) + ammo_type = /obj/item/ammo_casing/twentytwolr/simple + max_ammo = 12 + +/obj/item/ammo_magazine/box/twentytwolr/simple + name = "packet of standard .22LR rounds" + desc = "Container of ancient design intended for holding loose .22LR rounds." + icon_state = "box_22lr1" + origin_tech = "{'combat':2,'materials':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/twentytwolr/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/45/bullets.dm b/mods/persistence/modules/projectiles/ammunition/45/bullets.dm new file mode 100644 index 00000000000..c3b8e894759 --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/45/bullets.dm @@ -0,0 +1,34 @@ +#define CALIBER_45 ".45" + +/obj/item/ammo_casing/fortyfive + name = "generic .45 round" + desc = "An unsettlingly generic .45 round." + icon = 'mods/persistence/icons/obj/ammunition/45/tier1.dmi' + caliber = CALIBER_45 + projectile_type = /obj/item/projectile/bullet/fortyfive + +/obj/item/projectile/bullet/fortyfive + fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg' + damage = 20 + distance_falloff = 1 + +/obj/item/ammo_casing/fortyfive/handmade + name = "makeshift .45 round" + desc = ".45 round of dubious origin. Sports poor range and poor armor penetration due to shoddy construction." + icon = 'mods/persistence/icons/obj/ammunition/45/tier0.dmi' + projectile_type = /obj/item/projectile/bullet/fortyfive/handmade + +/obj/item/projectile/bullet/fortyfive/handmade + damage = 30 + distance_falloff = 5 + penetration_modifier = 1.2 + +/obj/item/ammo_casing/fortyfive/simple + name = "standard .45 round" + desc = ".45 round of ancient design. Sports mediocre range due to unimpressive velocity." + icon = 'mods/persistence/icons/obj/ammunition/45/tier1.dmi' + projectile_type = /obj/item/projectile/bullet/fortyfive/simple + +/obj/item/projectile/bullet/fortyfive/simple + damage = 40 + distance_falloff = 3 \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/45/magazines.dm b/mods/persistence/modules/projectiles/ammunition/45/magazines.dm new file mode 100644 index 00000000000..29883ae77b9 --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/45/magazines.dm @@ -0,0 +1,66 @@ +/obj/item/ammo_magazine/fortyfive + name = "generic .45 magazine" + desc = "An unsettlingly generic .45 magazine." + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + icon_state = "451" + mag_type = MAGAZINE + caliber = CALIBER_45 + material = /decl/material/solid/metal/steel + ammo_type = /obj/item/ammo_casing/fortyfive + initial_ammo = 0 + max_ammo = 0 + multiple_sprites = 1 + +/obj/item/ammo_magazine/box/fortyfive + name = "packet of generic .45 rounds" + desc = "A packet of unsettlingly generic .45 rounds." + icon_state = "box_451" + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + material = /decl/material/solid/metal/steel + caliber = CALIBER_45 + ammo_type = /obj/item/ammo_casing/fortyfive + max_ammo = 20 + +/obj/item/ammo_magazine/fortyfive/handmade + name = "makeshift .45 magazine" + desc = ".45 magazine of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship." + icon_state = "450" + origin_tech = "{'combat':1}" + material = /decl/material/solid/plastic + ammo_type = /obj/item/ammo_casing/fortyfive/handmade + max_ammo = 3 + +/obj/item/ammo_magazine/box/fortyfive/handmade + name = "packet of makeshift .45 rounds" + desc = "Container of dubious origin intended for holding loose .45 rounds." + icon_state = "box_450" + origin_tech = "{'combat':1,'materials':1}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/fortyfive/handmade + +/obj/item/ammo_magazine/fortyfive/simple + name = "standard .45 magazine" + desc = ".45 magazine of ancient design. Servicable capacity, but outpaced by more modern designs." + icon_state = "451" + origin_tech = "{'combat':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT + ) + ammo_type = /obj/item/ammo_casing/fortyfive/simple + max_ammo = 7 + +/obj/item/ammo_magazine/box/fortyfive/simple + name = "packet of standard .45 rounds" + desc = "Container of ancient design intended for holding loose .45 rounds." + icon_state = "box_451" + origin_tech = "{'combat':2,'materials':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/fortyfive/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm new file mode 100644 index 00000000000..1d4a139b9c0 --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/5.56/bullets.dm @@ -0,0 +1,35 @@ +#define CALIBER_556 "5.56x45mm" + +/obj/item/ammo_casing/fivefiftysix + name = "generic 5.56x45mm round" + desc = "An unsettlingly generic 5.56x45mm round." + icon = 'mods/persistence/icons/obj/ammunition/5.56/tier1.dmi' + caliber = CALIBER_556 + projectile_type = /obj/item/projectile/bullet/fivefiftysix + +/obj/item/projectile/bullet/fivefiftysix + fire_sound = 'sound/weapons/gunshot/gunshot3.ogg' + damage = 25 + distance_falloff = 1 + +/obj/item/ammo_casing/fivefiftysix/handmade + name = "makeshift 5.56x45mm round" + desc = "5.56x45mm round of dubious origin. Sports poor range and poor armor penetration due to shoddy construction." + icon = 'mods/persistence/icons/obj/ammunition/5.56/tier0.dmi' + projectile_type = /obj/item/projectile/bullet/fivefiftysix/handmade + +/obj/item/projectile/bullet/fivefiftysix/handmade + damage = 35 + distance_falloff = 4 + penetration_modifier = 1 + +/obj/item/ammo_casing/fivefiftysix/simple + name = "standard 5.56x45mm round" + desc = "5.56x45mm round of ancient design. Sports good armor penetration capabilities, but most firearms which use it are bulky." + icon = 'mods/persistence/icons/obj/ammunition/5.56/tier1.dmi' + projectile_type = /obj/item/projectile/bullet/fivefiftysix/simple + +/obj/item/projectile/bullet/fivefiftysix/simple + damage = 45 + distance_falloff = 2 + penetration_modifier = 0.8 \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm new file mode 100644 index 00000000000..13c07dcd20d --- /dev/null +++ b/mods/persistence/modules/projectiles/ammunition/5.56/magazines.dm @@ -0,0 +1,66 @@ +/obj/item/ammo_magazine/fivefiftysix + name = "generic 5.56x45mm magazine" + desc = "An unsettlingly generic 5.56x45mm magazine." + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + icon_state = "5561" + mag_type = MAGAZINE + caliber = CALIBER_556 + material = /decl/material/solid/metal/steel + ammo_type = /obj/item/ammo_casing/fivefiftysix + initial_ammo = 0 + max_ammo = 0 + multiple_sprites = 1 + +/obj/item/ammo_magazine/box/fivefiftysix + name = "packet of generic 5.56x45mm rounds" + desc = "A packet of unsettlingly generic 5.56x45mm rounds." + icon_state = "box_5561" + icon = 'mods/persistence/icons/obj/ammunition/magazines.dmi' + material = /decl/material/solid/metal/steel + caliber = CALIBER_556 + ammo_type = /obj/item/ammo_casing/fivefiftysix + max_ammo = 50 + +/obj/item/ammo_magazine/fivefiftysix/handmade + name = "makeshift 5.56x45mm magazine" + desc = "5.56x45mm magazine of dubious origin. Suffers from reduced capacity due to flimsy materials and shoddy craftsmanship." + icon_state = "5560" + origin_tech = "{'combat':1}" + material = /decl/material/solid/plastic + ammo_type = /obj/item/ammo_casing/fivefiftysix/handmade + max_ammo = 12 + +/obj/item/ammo_magazine/box/fivefiftysix/handmade + name = "packet of makeshift 5.56x45mm rounds" + desc = "Container of dubious origin intended for holding loose 5.56x45mm rounds." + icon_state = "box_5560" + origin_tech = "{'combat':1,'materials':1}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/fivefiftysix/handmade + +/obj/item/ammo_magazine/fivefiftysix/simple + name = "standard 5.56x45mm magazine" + desc = "5.56x45mm magazine of ancient design. Servicable capacity, but outpaced by more modern designs." + icon_state = "5561" + origin_tech = "{'combat':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT + ) + ammo_type = /obj/item/ammo_casing/fivefiftysix/simple + max_ammo = 20 + +/obj/item/ammo_magazine/box/fivefiftysix/simple + name = "packet of standard 5.56x45mm rounds" + desc = "Container of ancient design intended for holding loose 5.56x45mm rounds." + icon_state = "box_5561" + origin_tech = "{'combat':2,'materials':2}" + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/plastic = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/cardboard = MATTER_AMOUNT_TRACE + ) + ammo_type = /obj/item/ammo_casing/fivefiftysix/simple \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm index e4c46f05a91..f82989eaa53 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/boltaction.dm @@ -1,15 +1,15 @@ /obj/item/gun/projectile/bolt_action/handmade - name = "5.56 'Minuteman' BA" - desc = "Bolt-action rifle of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity. Chambered in 5.56." + name = "5.56x45mm 'Minuteman' BA" + desc = "Bolt-action rifle of dubious origin. Shoddy craftsmanship results in extremely low ammo capacity. Chambered in 5.56x45mm." icon = 'mods/persistence/icons/obj/guns/tier0/boltaction.dmi' force = 10 slot_flags = SLOT_BACK origin_tech = "{'combat':2,'engineering':1,'materials':1}" - caliber = CALIBER_RIFLE + caliber = CALIBER_556 handle_casings = HOLD_CASINGS load_method = SINGLE_CASING max_shells = 1 - ammo_type = /obj/item/ammo_casing/rifle + ammo_type = /obj/item/ammo_casing/fivefiftysix/handmade one_hand_penalty = 20 fire_delay = 20 accuracy = -1 diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm new file mode 100644 index 00000000000..e9e9f27af80 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/pistol.dm @@ -0,0 +1,21 @@ +/obj/item/gun/projectile/pistol/handmade + name = ".22LR 'Zip' HG" + desc = "Pistol of dubious origin. Struggles against armored targets, but carries the benefits of magazines over hand-loading. Chambered in .22LR." + icon = 'mods/persistence/icons/obj/guns/tier0/pistol.dmi' + fire_delay = 8 + force = 5 + accuracy = 0 + one_hand_penalty = 2 + origin_tech = "{'combat':3,'engineering':2,'materials':2}" + caliber = CALIBER_22LR + ammo_indicator = FALSE + w_class = ITEM_SIZE_NORMAL + magazine_type = /obj/item/ammo_magazine/twentytwolr/handmade + allowed_magazines = /obj/item/ammo_magazine/twentytwolr + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT + ) + +/obj/item/gun/projectile/pistol/handmade/empty + starts_loaded = FALSE \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm index 028176b03c7..29dd1838640 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/revolver.dm @@ -1,10 +1,10 @@ /obj/item/gun/projectile/revolver/handmade - name = "10mm 'Underdog' RV" - desc = "Revolver of dubious origin. Shoddy craftsmanship results in low ammo capacity and high recoil. Chambered in 10mm." + name = ".45 'Underdog' RV" + desc = "Revolver of dubious origin. Shoddy craftsmanship results in low ammo capacity and high recoil. Chambered in .45." icon = 'mods/persistence/icons/obj/guns/tier0/revolver.dmi' origin_tech = "{'combat':2,'engineering':1,'materials':1}" - caliber = CALIBER_PISTOL - ammo_type = /obj/item/ammo_casing/pistol + caliber = CALIBER_45 + ammo_type = /obj/item/ammo_casing/fortyfive/handmade max_shells = 3 w_class = ITEM_SIZE_NORMAL fire_delay = 12 diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm index 839c2a8d6f1..cfaf579981e 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier0/shotgun.dm @@ -8,9 +8,9 @@ w_class = ITEM_SIZE_HUGE force = 5 // lacks a butt for effective rifle-whipping slot_flags = SLOT_BACK - caliber = CALIBER_SHOTGUN + caliber = CALIBER_12G origin_tech = "{'combat':2,'engineering':1,'materials':1}" - ammo_type = /obj/item/ammo_casing/shotgun/beanbag + ammo_type = /obj/item/ammo_casing/twelvegauge/slug/handmade screen_shake = 2 accuracy = -1 one_hand_penalty = 10 diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm index 202c4d3451d..5fa9d034bf3 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/boltaction.dm @@ -1,16 +1,16 @@ /obj/item/gun/projectile/bolt_action/simple - name = "5.56 'Mosin' BA" - desc = "Bolt-action rifle of ancient design. Reliable, but slow-firing. Chambered in 5.56." + name = "5.56x45mm 'Mosin' BA" + desc = "Bolt-action rifle of ancient design. Reliable, but slow-firing. Chambered in 5.56x45mm." icon = 'mods/persistence/icons/obj/guns/tier1/boltaction.dmi' force = 10 slot_flags = SLOT_BACK origin_tech = "{'combat':3,'engineering':2,'materials':2}" - caliber = CALIBER_RIFLE + caliber = CALIBER_556 handle_casings = HOLD_CASINGS load_method = SINGLE_CASING max_shells = 5 w_class = ITEM_SIZE_HUGE - ammo_type = /obj/item/ammo_casing/rifle + ammo_type = /obj/item/ammo_casing/fivefiftysix one_hand_penalty = 10 fire_delay = 12 accuracy = 0 diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm index 517db03dcd5..6b2113d316b 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol.dm @@ -1,14 +1,17 @@ /obj/item/gun/projectile/pistol/simple - name = "10mm 'Colt' HG" - desc = "Pistol of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm." + name = ".45 'Colt' HG" + desc = "Pistol of ancient design. Reliable, but struggles against armored targets. Chambered in .45." icon = 'mods/persistence/icons/obj/guns/tier1/pistol.dmi' + caliber = CALIBER_45 fire_delay = 5 force = 5 accuracy = 1 - one_hand_penalty = 0 + one_hand_penalty = 1 origin_tech = "{'combat':3,'engineering':2,'materials':2}" ammo_indicator = FALSE w_class = ITEM_SIZE_NORMAL + magazine_type = /obj/item/ammo_magazine/fortyfive/simple + allowed_magazines = /obj/item/ammo_magazine/fortyfive material = /decl/material/solid/metal/steel matter = list( /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT, diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm index 13b63862984..f15b77a59b9 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_gold.dm @@ -1,6 +1,6 @@ /obj/item/gun/projectile/pistol/simple/golden - name = "10mm 'Colt-M' HG" - desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armored targets. Chambered in 10mm." + name = ".45 'Colt-M' HG" + desc = "Luxurious pistol of ancient design. Reliable and fabulous, but struggles against armored targets. Chambered in .45." icon = 'mods/persistence/icons/obj/guns/tier1/pistol_gold.dmi' origin_tech = "{'combat':3,'engineering':2,'materials':5}" material = /decl/material/solid/metal/steel diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm new file mode 100644 index 00000000000..93315582de1 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/pistol_pocket.dm @@ -0,0 +1,22 @@ +/obj/item/gun/projectile/pistol_pocket/simple + name = ".22LR 'Rimfire' HG" + desc = "Pistol of ancient design. Small enough to store in pockets, but struggles in combat due to weak caliber. Chambered in .22LR." + icon = 'mods/persistence/icons/obj/guns/tier1/pistol_pocket.dmi' + fire_delay = 3 + force = 5 + accuracy = 1 + one_hand_penalty = 0 + origin_tech = "{'combat':3,'engineering':2,'materials':2}" + caliber = CALIBER_22LR + ammo_indicator = FALSE + w_class = ITEM_SIZE_SMALL + magazine_type = /obj/item/ammo_magazine/twentytwolr/simple + allowed_magazines = /obj/item/ammo_magazine/twentytwolr + material = /decl/material/solid/metal/steel + matter = list( + /decl/material/solid/wood = MATTER_AMOUNT_REINFORCEMENT, + /decl/material/solid/metal/aluminium = MATTER_AMOUNT_TRACE + ) + +/obj/item/gun/projectile/pistol_pocket/simple/empty + starts_loaded = FALSE \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm index 4369159ffa4..7947ed52b90 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/revolver.dm @@ -1,15 +1,15 @@ /obj/item/gun/projectile/revolver/simple - name = "10mm 'Chief' RV" - desc = "Revolver of ancient design. Reliable, but struggles against armored targets. Chambered in 10mm." + name = ".45 'Chief' RV" + desc = "Revolver of ancient design. Reliable, but struggles against armored targets. Chambered in .45." icon = 'mods/persistence/icons/obj/guns/tier1/revolver.dmi' origin_tech = "{'combat':3,'engineering':2,'materials':2}" - caliber = CALIBER_PISTOL - ammo_type = /obj/item/ammo_casing/pistol + caliber = CALIBER_45 + ammo_type = /obj/item/ammo_casing/fortyfive/simple max_shells = 5 w_class = ITEM_SIZE_NORMAL fire_delay = 10 - accuracy = 0 - one_hand_penalty = 0 + accuracy = 2 + one_hand_penalty = 1 force = 5 material = /decl/material/solid/metal/steel matter = list( diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm index 90e12a57390..13feb548112 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db.dm @@ -8,9 +8,9 @@ w_class = ITEM_SIZE_HUGE force = 10 slot_flags = SLOT_BACK - caliber = CALIBER_SHOTGUN + caliber = CALIBER_12G origin_tech = "{'combat':3,'engineering':2,'materials':2}" - ammo_type = /obj/item/ammo_casing/shotgun/beanbag + ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple screen_shake = 1 accuracy = 0 one_hand_penalty = 10 @@ -22,7 +22,7 @@ burst_delay = 0 firemodes = list( list(mode_name="fire one barrel at a time", burst=1), - list(mode_name="fire both barrels at once", burst=2) + list(mode_name="fire two barrels at a time", burst=2) ) /obj/item/gun/projectile/shotgun/simple/empty diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm new file mode 100644 index 00000000000..49897071c70 --- /dev/null +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_db_sawn.dm @@ -0,0 +1,14 @@ +/obj/item/gun/projectile/shotgun/simple/sawnoff + name = "compact 12g 'Bouncer' SG" + desc = "Break-action shotgun of ancient design. Powerful and can be worn on the waist, but struggles in prolonged engagements due to low ammo capacity and unwieldiness. Can fire one or both chambers at a time. Chambered in 12 gauge." + icon = 'mods/persistence/icons/obj/guns/tier1/shotgun_db_sawn.dmi' + w_class = ITEM_SIZE_LARGE + force = 5 + slot_flags = SLOT_LOWER_BODY|SLOT_BACK + origin_tech = "{'combat':3,'engineering':3,'materials':2}" + screen_shake = 2 + accuracy = -1 + one_hand_penalty = 15 + +/obj/item/gun/projectile/shotgun/simple/sawnoff/empty + starts_loaded = FALSE \ No newline at end of file diff --git a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm index 2a3034cb96d..cb2fd3c2fb4 100644 --- a/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm +++ b/mods/persistence/modules/projectiles/guns/projectile/tier1/shotgun_pump.dm @@ -7,10 +7,10 @@ w_class = ITEM_SIZE_HUGE force = 10 slot_flags = SLOT_BACK - caliber = CALIBER_SHOTGUN + caliber = CALIBER_12G origin_tech = "{'combat':3,'engineering':2,'materials':2}" load_method = SINGLE_CASING - ammo_type = /obj/item/ammo_casing/shotgun/beanbag + ammo_type = /obj/item/ammo_casing/twelvegauge/slug/simple handle_casings = HOLD_CASINGS one_hand_penalty = 10 material = /decl/material/solid/metal/steel diff --git a/mods/persistence/modules/projectiles/overrides.dm b/mods/persistence/modules/projectiles/overrides.dm index 03882b5ed51..5380d7996e0 100644 --- a/mods/persistence/modules/projectiles/overrides.dm +++ b/mods/persistence/modules/projectiles/overrides.dm @@ -33,3 +33,18 @@ /datum/fabricator_recipe/protolathe/weapon/bullpup research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/ammo + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/ammo/stunshell + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/ammo/ammo_emp_small + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/ammo/ammo_emp_pistol + research_excluded = TRUE + +/datum/fabricator_recipe/protolathe/ammo/ammo_emp_slug + research_excluded = TRUE \ No newline at end of file