mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
Automatic pistol, nutriment and sprites fixes (#1617)
-fix #1217 -fix being unable to put the tactical pistol into belts/holsters, also remove needless code from it -fix the scout rifle not accepting other magazines -fix the hardsuit nutriment being useless and just dealing minor toxin damage -fix missing tactical masks and tapes from unathi and tajaran sprites -fix tapes cuffs, blinders and etc not updating when equiped to said mob -some extra tweaks to the hud code
This commit is contained in:
@@ -84,7 +84,7 @@
|
||||
desc += "<br>Linked to: [user.real_name]"
|
||||
return
|
||||
|
||||
/obj/item/weapon/gun/energy/lawgiver/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
|
||||
/obj/item/weapon/gun/energy/lawgiver/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, pointblank=0, reflex = 0)
|
||||
if(src.dna != user.dna.unique_enzymes && !emagged)
|
||||
if(istype(user, /mob/living/carbon/human))
|
||||
//Save the users active hand
|
||||
|
||||
@@ -54,24 +54,21 @@
|
||||
icon_state = "secgundark"
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/x9
|
||||
name = "x9 tactical pistol"
|
||||
desc = "A lightweight, fast firing handgun, excels at firing the medium caliber .45 in controlled shooting."
|
||||
name = "automatic .45 pistol"
|
||||
desc = "The x9 tactical pistol is a lightweight fast firing handgun. Uses .45 rounds."
|
||||
icon_state = "x9tactical"
|
||||
w_class = 3
|
||||
load_method = MAGAZINE
|
||||
slot_flags = SLOT_BELT|SLOT_HOLSTER
|
||||
max_shells = 16
|
||||
caliber = ".45"
|
||||
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
|
||||
ammo_type = /obj/item/ammo_casing/c45
|
||||
magazine_type = /obj/item/ammo_magazine/c45x
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/c45x)
|
||||
multi_aim = 1
|
||||
auto_eject = 1
|
||||
|
||||
firemodes = list(
|
||||
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
|
||||
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0)),
|
||||
list(mode_name="short bursts", burst=5, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1,-2,-2), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2))
|
||||
)
|
||||
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
|
||||
|
||||
/obj/item/weapon/gun/projectile/tanto
|
||||
desc = "A Necropolis Industries Tanto .40, designed to compete with the NT Mk58. Uses 10mm rounds."
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
max_shells = 10
|
||||
ammo_type = /obj/item/ammo_casing/a556/ap
|
||||
magazine_type = /obj/item/ammo_magazine/a556/ap
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/a556/ap)
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/a556, /obj/item/ammo_magazine/a556/ap)
|
||||
accuracy = -2
|
||||
scoped_accuracy = 3
|
||||
recoil_wielded = 2
|
||||
|
||||
Reference in New Issue
Block a user