cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 15:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Detective Gun Rebalance - Flash ammo edition. (#8634)

Browse Source
This commit is contained in:
TheDanseMacabre
2020-04-18 22:41:44 -04:00
committed by GitHub
parent 48965fbc77
commit 0522bcd3ae
3 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -84,23 +84,6 @@
else
icon_state = "secgunwood-e"
/obj/item/gun/projectile/sec/detective
desc = "A compact NanoTrasen designed sidearm, popular with law enforcement personnel for concealed carry purposes. It has a faux wooden grip. Uses .45 rounds."
description_fluff = "The NT Mk21 Blackjack is a ballistic sidearm developed and produced by Nanotrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in .45 caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - .45 in such a small package does not play well with the average shooter."
name = "compact .45 pistol"
icon = 'icons/obj/guns/detgun.dmi'
icon_state = "detgun"
item_state = "detgun"
w_class = ITEMSIZE_SMALL
magazine_type = /obj/item/ammo_magazine/c45m
/obj/item/gun/projectile/sec/detective/update_icon()
..()
if(ammo_magazine?.stored_ammo.len)
icon_state = "detgun"
else
icon_state = "detgunempty"
/obj/item/gun/projectile/automatic/x9
name = "automatic .45 pistol"
desc = "The x9 tactical pistol is a lightweight fast firing handgun. Uses .45 rounds."
@@ -255,6 +238,35 @@
name = "9mm signal pistol"
magazine_type = /obj/item/ammo_magazine/mc9mm/flash
/obj/item/gun/projectile/pistol/detective
desc = "A compact NanoTrasen designed sidearm, popular with law enforcement personnel for concealed carry purposes. It has a faux wooden grip. Uses 9mm rounds."
description_fluff = "The NT Mk21 Blackjack is a ballistic sidearm developed and produced by Nanotrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
name = "compact 9mm pistol"
magazine_type = /obj/item/ammo_magazine/mc9mm/flash
icon = 'icons/obj/guns/detgun.dmi'
icon_state = "detgun"
item_state = "detgun"
can_silence = FALSE
/obj/item/gun/projectile/pistol/detective/update_icon()
..()
if(ammo_magazine?.stored_ammo.len)
icon_state = "detgun"
else
icon_state = "detgunempty"
/obj/item/gun/projectile/pistol/detective/verb/rename_gun()
set name = "Name Gun"
set category = "Object"
set desc = "Rename your gun."
var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN)
if(use_check_and_message(usr))
return
name = input
to_chat(usr, "You name the gun [input]. Say hello to your new friend.")
/obj/item/gun/projectile/pistol/attack_hand(mob/user as mob)
if(user.get_inactive_hand() == src)
if(silenced && can_silence)