Skip to content

Commit

Permalink
M20 Auto Elite (#3992)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![handcannon](https://github.com/user-attachments/assets/bd606c37-584c-4540-ba45-984632c4c9ee)

Adds the M20 Auto Elite, a heavy pistol manufactured by Serene Outdoors
and chambered in .44 Roumain (subject to change in future ammo reworks).
Originally designed for Star City's police department after a series of
incidents proved the need for a handgun more powerful than the 9mm and
.45 pistols they had been using, the Auto Elite is a weighty slab of
steel with the capacity for ten powerful .44 Roumain rounds, capable of
punching through armor better than other handguns while still dealing
substantial damage. While it proved bulky and inconvenient for police
use, it found a niche as a sidearm for big game hunters and as a flashy
option for mercenaries and other people with something to prove.

Also adds the PO-20 Pinscher, Inteq's modification of the Auto Elite.
Being more readily available than 5.7 and 4.6mm options while also
having a heavier impact on target, Inteq has chosen the Auto Elite as a
standard sidearm for Vanguards and other ranking personnel. Rollout is
still in-progress, so Inteq ships on deployment will have to requisition
them on their own for now.

Both versions of the Auto Elite are available in cargo, with the
Pinscher being faction-locked to Inteq.

## Why It's Good For The Game

fills a niche and fleshes out Serene's catalogue a bit. Now indies have
access to a semi-auto heavy pistol that nevertheless has a bit less
punch than something like the CM-357, and Inteq has a designated officer
pistol.

## Changelog

:cl:
add: Added M20 Auto Elite and PO-20 Pinscher heavy pistols.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Apogee-dev authored Jan 18, 2025
1 parent bf08273 commit e559da0
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 2 deletions.
8 changes: 8 additions & 0 deletions code/game/objects/items/storage/filled_guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
21 changes: 19 additions & 2 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down
6 changes: 6 additions & 0 deletions code/modules/cargo/packs/magazines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified icons/obj/guns/manufacturer/inteq/48x32.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi
Binary file not shown.

0 comments on commit e559da0

Please sign in to comment.