Skip to content

Commit

Permalink
[MIRROR] Adds a new pistol, the Zashch 10mm (#5350)
Browse files Browse the repository at this point in the history
* Adds a new pistol, the Zashch 10mm (#4794)

* Adds a new pistol, the Zashch 10mm

Adds the 'Zashch' 10mm pistol to the game, a slow firing pistol with a time to crit on a human of 4 seconds, but boasts 18 rounds in a magazine, giving it the highest damage-per-reload of any handgun crew acquirable in the game.

It is sold by NRI surplus for the same price as the Bobr revolver. It is chambered for 10mm to give life to a dead calibre and to give a crew-gun that fires the bullet, to give the calibre a chance to have a life outside of being solely an evil syndicate calibre that is for some reason, orderable from cargo.

Magazines, in-hand sprites, and mob sprites are all tested and functioning correctly, as if the flashlight function.

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* Update modular_nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/pistol.dm

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

* [MIRROR] Adds a new pistol, the Zashch 10mm

---------

Co-authored-by: Trelus <140990718+Trelus@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: StealsThePRs <StealsThe@Email.com>
  • Loading branch information
4 people authored Jan 28, 2025
1 parent ddd3a9d commit 2c7fd99
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@
item_type = /obj/item/gun/ballistic/revolver/shotgun_revolver
cost = PAYCHECK_COMMAND * 6

/datum/armament_entry/company_import/nri_surplus/firearm/zashch
item_type = /obj/item/gun/ballistic/automatic/pistol/zashch
cost = PAYCHECK_COMMAND * 6

/datum/armament_entry/company_import/nri_surplus/firearm/plasma_thrower
item_type = /obj/item/gun/ballistic/automatic/pistol/plasma_thrower
cost = PAYCHECK_COMMAND * 6
Expand Down Expand Up @@ -128,6 +132,9 @@
subcategory = "Firearm Magazines"
cost = PAYCHECK_CREW

/datum/armament_entry/company_import/nri_surplus/firearm_ammo/zashch
item_type = /obj/item/ammo_box/magazine/zashch/spawns_empty

/datum/armament_entry/company_import/nri_surplus/firearm_ammo/plasma_battery
item_type = /obj/item/ammo_box/magazine/recharge/plasma_battery

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,19 @@
ammo_type = /obj/item/ammo_casing/p60strela
max_ammo = 3
caliber = CALIBER_60STRELA

// Magazine for the Zashch pistol

/obj/item/ammo_box/magazine/zashch
name = "\improper Zashch pistol magazine"
desc = "A large magazine for the Zashchitnik pistol. Holds 18 rounds of 10mm."
icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/ammo.dmi'
icon_state = "zashch_mag"
base_icon_state = "zashch_mag"
multiple_sprites = AMMO_BOX_FULL_EMPTY
ammo_type = /obj/item/ammo_casing/c10mm
max_ammo = 18
caliber = CALIBER_10MM

/obj/item/ammo_box/magazine/zashch/spawns_empty
start_empty = TRUE
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
Earlier claims by competitors passed it off as terrible against armor, \
but in reality, it's about as effective as any ballistic you could get your hands on! \
As long as your sector, and local-command permits automatic weapons, that is... and grevious wounds."

return .

// Plasma sharpshooter pistol
Expand Down Expand Up @@ -119,3 +119,45 @@
weapon to grace someone's hands, it might be the most practical."

return .

// A 10mm pistol that shoots slow as all get out, but has that deep dish magazine going on

/obj/item/gun/ballistic/automatic/pistol/zashch
name = "\improper 'Zashch' self-loading pistol"
desc = "A hulking self-loading handgun designated 'Zashchitnik'. Feeds from large 18 round box magazines. Chambered for 10mm."
icon = 'modular_nova/modules/modular_weapons/icons/obj/company_and_or_faction_based/szot_dynamica/guns_32.dmi'
icon_state = "zashch"
lefthand_file = 'modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_lefthand.dmi'
righthand_file = 'modular_nova/modules/modular_weapons/icons/mob/company_and_or_faction_based/szot_dynamica/guns_righthand.dmi'
inhand_icon_state = "zashch"
w_class = WEIGHT_CLASS_NORMAL
accepted_magazine_type = /obj/item/ammo_box/magazine/zashch
can_suppress = FALSE
fire_delay = 1 SECONDS
fire_sound = 'modular_nova/modules/modular_weapons/sounds/pistol_heavy.ogg'
rack_sound = 'sound/items/weapons/gun/pistol/rack.ogg'
lock_back_sound = 'sound/items/weapons/gun/pistol/slide_lock.ogg'
bolt_drop_sound = 'sound/items/weapons/gun/pistol/slide_drop.ogg'
fire_sound_volume = 80
custom_premium_price = PAYCHECK_COMMAND * 6

/obj/item/gun/ballistic/automatic/pistol/zashch/give_manufacturer_examine()
AddElement(/datum/element/manufacturer_examine, COMPANY_SZOT)

/obj/item/gun/ballistic/automatic/pistol/zashch/add_seclight_point()
AddComponent(/datum/component/seclite_attachable, \
starting_light = new /obj/item/flashlight/seclite(src), \
is_light_removable = FALSE, \
)

/obj/item/gun/ballistic/automatic/pistol/zashch/examine_more(mob/user)
. = ..()

. += "The Zashchitnik self-loading pistol was designed as a police and security sidearm for ballistic favoring forces. \
Choosing to chamber the 10mm cartridge for its exceptional stopping power, \
the hulking pistol is known to be a powerful firearm, albeit maligned by some units for the sheer size. \
The size was dictated necessary for several reasons during the design, not the least so that it can load expansive \
magazines flush to the grip that allow for exceptionally large amounts of fire power. \
It has found niche use with security forces both corporate and state sponsored in more middling economic locations."

return .
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 2c7fd99

Please sign in to comment.