diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm index d971c9687a4b..045f2dadb988 100644 --- a/code/game/objects/items/storage/filled_guncases.dm +++ b/code/game/objects/items/storage/filled_guncases.dm @@ -157,6 +157,10 @@ gun_type = /obj/item/gun/ballistic/automatic/pistol/m17 mag_type = /obj/item/ammo_box/magazine/m17 +/obj/item/storage/guncase/pistol/m20_auto_elite + gun_type = /obj/item/gun/ballistic/automatic/pistol/m20_auto_elite + mag_type = /obj/item/ammo_box/magazine/m20_auto_elite + /obj/item/storage/guncase/m12 gun_type = /obj/item/gun/ballistic/automatic/m12_sporter mag_type = /obj/item/ammo_box/magazine/m12_sporter @@ -299,6 +303,10 @@ gun_type = /obj/item/gun/ballistic/automatic/pistol/commander/inteq mag_type = /obj/item/ammo_box/magazine/co9mm +/obj/item/storage/guncase/pistol/pinscher + gun_type = /obj/item/gun/ballistic/automatic/pistol/m20_auto_elite/inteq + mag_type = /obj/item/ammo_box/magazine/m20_auto_elite + /obj/item/storage/guncase/mongrel gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq mag_type = /obj/item/ammo_box/magazine/smgm10mm diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 82aa3d4be0ff..7131eca5b7e4 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -23,12 +23,19 @@ faction = /datum/faction/srm /datum/supply_pack/gun/m17 - name = "M17 pistol Crate" - desc = "A cheap target shooting pistol manufactured by Serene Outdoors. Chambered in .22lr" + name = "M17 Micro Target Pistol Crate" + desc = "A cheap target shooting pistol manufactured by Serene Outdoors. Chambered in .22 LR." cost = 400 contains = list(/obj/item/storage/guncase/pistol/m17) crate_name = "pistol crate" +/datum/supply_pack/gun/m20_auto_elite + name = "M20 Auto Elite Pistol Crate" + desc = "Contains a heavy pistol manufactured by Serene Outdoors. Chambered in .44 Roumain." + cost = 1250 + contains = list(/obj/item/storage/guncase/pistol/m20_auto_elite) + crate_name = "pistol crate" + /datum/supply_pack/gun/commanders name = "Commander Pistol Crate" desc = "Contains a double stacked Commander pistol, produced by Nanotrasen along with Vigilitas Interstellar and is chambered in 9mm." @@ -71,6 +78,16 @@ faction_discount = 0 faction_locked = TRUE +/datum/supply_pack/gun/pinscher + name = "Pinscher Heavy Pistol Crate" + desc = "Contains a heavy pistol manufactured by Serene Outdoors and modified to fit IRMG's standards. Chambered in .44 Roumain." + cost = 1250 + contains = list(/obj/item/storage/guncase/pistol/pinscher) + crate_name = "pistol crate" + faction = /datum/faction/inteq + faction_discount = 0 + faction_locked = TRUE + /datum/supply_pack/gun/candors name = "Candor Pistol Crate" desc = "Contains a Candor pistol, the trusty sidearm of any spacer, produced by Hunter's Pride and chambered in .45 ACP." diff --git a/code/modules/cargo/packs/magazines.dm b/code/modules/cargo/packs/magazines.dm index 13f8e8ec1858..219fce130049 100644 --- a/code/modules/cargo/packs/magazines.dm +++ b/code/modules/cargo/packs/magazines.dm @@ -85,6 +85,12 @@ contains = list(/obj/item/ammo_box/magazine/m15/empty) cost = 300 +/datum/supply_pack/magazine/m20_auto_elite + name = "Auto Elite Magazine Crate" + desc = "Contains a .44 Roumain magazine for the Auto Elite pistol, with a capacity of ten rounds." + contains = list(/obj/item/ammo_box/magazine/m20_auto_elite/empty) + cost = 250 + /* Scarbie */ /datum/supply_pack/magazine/himehabu_mag diff --git a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm index ff36ffcd2292..0bebb8ffcb4e 100644 --- a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm @@ -64,6 +64,71 @@ EMPTY_GUN_HELPER(automatic/pistol/m17) /obj/item/ammo_box/magazine/m17/empty start_empty = TRUE +/* Auto Elite */ + +/obj/item/gun/ballistic/automatic/pistol/m20_auto_elite + name = "Model 20 \"Auto Elite\"" + desc = "A large handgun chambered .44 Roumain. Originally developed by Serene Outdoors for the Star City Police Department when their older handguns proved underpowered, the Auto Elite proved heavy and unwieldy in practice. It has nevertheless seen modest success as a sidearm for big game hunters and among customers looking to make an impression." + + icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi' + lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi' + mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi' + icon_state = "m20" + item_state = "so_generic" + + default_ammo_type = /obj/item/ammo_box/magazine/m20_auto_elite + allowed_ammo_types = list( + /obj/item/ammo_box/magazine/m20_auto_elite, + ) + + fire_sound = 'sound/weapons/gun/pistol/cm23.ogg' + rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg' + lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' + bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg' + manufacturer = MANUFACTURER_SERENE + load_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg' + load_empty_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg' + eject_sound = 'sound/weapons/gun/pistol/deagle_unload.ogg' + eject_empty_sound = 'sound/weapons/gun/pistol/deagle_unload.ogg' + + recoil_unwielded = 4 + recoil = 1 + +NO_MAG_GUN_HELPER(automatic/pistol/m20_auto_elite) + +/obj/item/ammo_box/magazine/m20_auto_elite + name = "Model 20 magazine (.44 Roumain)" + desc = "A 10-round magazine designed for the Model 20 pistol. These rounds do good damage, and fare better against armor." + icon_state = "cm23_mag-1" + base_icon_state = "cm23_mag" + ammo_type = /obj/item/ammo_casing/a44roum + caliber = ".44 Roumain" + max_ammo = 9 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/m20_auto_elite/empty + start_empty = TRUE + +/obj/item/gun/ballistic/automatic/pistol/m20_auto_elite/inteq + name = "PO-20 Pinscher" + desc = "A large handgun chambered .44 Roumain and manufactured by Serene Outdoors. Modified to Inteq Risk Management Group's standards and issued as a heavy sidearm for officers." + + icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi' + lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi' + mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi' + icon_state = "m20_inteq" + item_state = "inteq_generic" + + default_ammo_type = /obj/item/ammo_box/magazine/m20_auto_elite + allowed_ammo_types = list( + /obj/item/ammo_box/magazine/m20_auto_elite, + ) + +/obj/item/ammo_box/magazine/m20_auto_elite/inteq/empty + start_empty = TRUE + /* Sporter */ /obj/item/gun/ballistic/automatic/m12_sporter diff --git a/icons/obj/guns/manufacturer/inteq/48x32.dmi b/icons/obj/guns/manufacturer/inteq/48x32.dmi index 68aaf75810df..4b3058fc885c 100644 Binary files a/icons/obj/guns/manufacturer/inteq/48x32.dmi and b/icons/obj/guns/manufacturer/inteq/48x32.dmi differ diff --git a/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi index d728fe7bdbf0..9b75cb2f681c 100644 Binary files a/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi and b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi differ