mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 13:30:42 +01:00
Security weaponry and balance tweaks. (#15297)
This commit is contained in:
@@ -518,7 +518,7 @@
|
||||
if(length(firemodes))
|
||||
F = firemodes[sel_mode]
|
||||
if(one_hand_fa_penalty > 2 && !wielded && F?.name == "full auto") // todo: make firemode names defines
|
||||
P.accuracy -= one_hand_fa_penalty/2
|
||||
P.accuracy -= one_hand_fa_penalty * 0.5
|
||||
P.dispersion -= one_hand_fa_penalty * 0.5
|
||||
|
||||
//does the actual launching of the projectile
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
list(mode_name="semiauto", can_autofire=0, burst=1),
|
||||
list(mode_name="3-round bursts", can_autofire=0, burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 10, 15)),
|
||||
list(mode_name="short bursts", can_autofire=0, burst=5, burst_accuracy=list(1,0,,-1,-1), dispersion=list(5, 10, 15, 20)),
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=5, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
|
||||
)
|
||||
|
||||
//Submachine guns and personal defence weapons, go.
|
||||
@@ -136,7 +136,7 @@
|
||||
list(mode_name="semiauto", burst=1, fire_delay=10),
|
||||
list(mode_name="3-round bursts", burst=3, burst_accuracy=list(1,0,0), dispersion=list(0, 5, 10)),
|
||||
list(mode_name="short bursts", burst=5, burst_accuracy=list(1,0,0,-1,-1), dispersion=list(5, 5, 15)),
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)),
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=5, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25)),
|
||||
)
|
||||
|
||||
//slower to regain aim, more inaccurate if not wielding
|
||||
@@ -181,7 +181,7 @@
|
||||
knife_y_offset = 13
|
||||
firemodes = list(
|
||||
list(mode_name="semiauto", burst=1, fire_delay=8),
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, fire_delay_wielded=1, one_hand_fa_penalty=22, burst_accuracy = list(0,-1,-1,-1,-2,-2,-2,-3), dispersion = list(5, 5, 10, 15, 20)),
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=5, fire_delay_wielded=1, one_hand_fa_penalty=22, burst_accuracy = list(0,-1,-1,-1,-2,-2,-2,-3), dispersion = list(5, 5, 10, 15, 20)),
|
||||
)
|
||||
|
||||
fire_delay = 8
|
||||
@@ -394,7 +394,7 @@
|
||||
firemodes = list(
|
||||
list(mode_name="short bursts", burst=5, burst_accuracy = list(1,0,0,-1,-1), dispersion = list(3, 6, 9)),
|
||||
list(mode_name="long bursts", burst=8, burst_accuracy = list(1,0,0,-1,-1,-1,-2,-2), dispersion = list(8)),
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=5, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
|
||||
)
|
||||
|
||||
var/cover_open = 0
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
firemodes = list(
|
||||
list(mode_name="short bursts", can_autofire=0, burst=6, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(3, 6, 9)),
|
||||
list(mode_name="long bursts", can_autofire=0, burst=12, move_delay=9, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(8)),
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=1, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
|
||||
list(mode_name="full auto", can_autofire=1, burst=1, fire_delay=5, fire_delay_wielded=1, one_hand_fa_penalty=12, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(5, 10, 15, 20, 25))
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
/obj/item/projectile/beam/midlaser
|
||||
damage = 30
|
||||
armor_penetration = 15
|
||||
armor_penetration = 25
|
||||
|
||||
/obj/item/projectile/beam/midlaser/skrell
|
||||
armor_penetration = 0
|
||||
@@ -56,11 +56,11 @@
|
||||
|
||||
/obj/item/projectile/beam/noctiluca
|
||||
damage = 20
|
||||
armor_penetration = 28
|
||||
armor_penetration = 40
|
||||
|
||||
/obj/item/projectile/beam/noctiluca/armor_piercing
|
||||
name = "concentrated laser"
|
||||
damage = 15
|
||||
damage = 20
|
||||
armor_penetration = 50
|
||||
|
||||
muzzle_type = /obj/effect/projectile/muzzle/laser/scc
|
||||
@@ -88,7 +88,7 @@
|
||||
name = "xray beam"
|
||||
icon_state = "xray"
|
||||
damage = 15
|
||||
armor_penetration = 35
|
||||
armor_penetration = 50
|
||||
|
||||
muzzle_type = /obj/effect/projectile/muzzle/xray
|
||||
tracer_type = /obj/effect/projectile/tracer/xray
|
||||
|
||||
@@ -151,6 +151,7 @@
|
||||
/obj/item/projectile/bullet/shotgun
|
||||
name = "slug"
|
||||
damage = 55
|
||||
armor_penetration = 5
|
||||
|
||||
/obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets
|
||||
name = "beanbag"
|
||||
@@ -213,7 +214,7 @@
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a556
|
||||
damage = 30
|
||||
armor_penetration = 26
|
||||
armor_penetration = 28
|
||||
penetrating = FALSE
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a556/ap
|
||||
@@ -222,8 +223,8 @@
|
||||
penetrating = TRUE
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a556/polymer
|
||||
damage = 24
|
||||
armor_penetration = 32
|
||||
damage = 25
|
||||
armor_penetration = 34
|
||||
penetrating = FALSE
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a145
|
||||
@@ -431,7 +432,8 @@
|
||||
name = "anti-tank warhead"
|
||||
icon_state = "missile"
|
||||
damage = 30
|
||||
anti_materiel_potential = 3
|
||||
armor_penetration = 30
|
||||
anti_materiel_potential = 4
|
||||
embed = FALSE
|
||||
penetrating = FALSE
|
||||
armor_penetration = 10
|
||||
@@ -444,6 +446,8 @@
|
||||
/obj/item/projectile/bullet/recoilless_rifle/peac
|
||||
name = "anti-tank missile"
|
||||
icon_state = "peac"
|
||||
damage = 45
|
||||
damage = 25
|
||||
armor_penetration = 35
|
||||
anti_materiel_potential = 6
|
||||
penetrating = TRUE
|
||||
heavy_impact_range = -1
|
||||
Reference in New Issue
Block a user