mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-03 05:51:56 +00:00
Fixed ERT Update (#1266)
Credits for content go to Serveris. All I did was fix it up for the baymerge and got it working in-game (Yes I know zipties don't stack. I couldn't figure it out. Maybe latter.)
This commit is contained in:
@@ -40,6 +40,29 @@
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
|
||||
fire_sound = 'sound/weapons/Gunshot_light.ogg'
|
||||
load_method = MAGAZINE
|
||||
/obj/item/weapon/gun/projectile/sec/lethal
|
||||
magazine_type = /obj/item/ammo_magazine/c45m
|
||||
|
||||
/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."
|
||||
icon_state = "x9tactical"
|
||||
w_class = 3
|
||||
load_method = MAGAZINE
|
||||
max_shells = 16
|
||||
caliber = ".45"
|
||||
slot_flags = slot_belt
|
||||
origin_tech = "combat=4;materials=2"
|
||||
ammo_type = /obj/item/ammo_casing/c45
|
||||
magazine_type = /obj/item/ammo_magazine/c45x
|
||||
multi_aim = 1
|
||||
auto_eject = 1
|
||||
|
||||
firemodes = list(
|
||||
list(name="semiauto", burst=1, fire_delay=0),
|
||||
list(name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0)),
|
||||
list(name="short bursts", burst=5, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
|
||||
)
|
||||
|
||||
/obj/item/weapon/gun/projectile/sec/flash
|
||||
name = ".45 signal pistol"
|
||||
|
||||
36
code/modules/projectiles/guns/projectile/scout_sniper.dm
Normal file
36
code/modules/projectiles/guns/projectile/scout_sniper.dm
Normal file
@@ -0,0 +1,36 @@
|
||||
/obj/item/weapon/gun/projectile/automatic/rifle/w556
|
||||
name = "\improper Neyland 556mi 'Ranger'"
|
||||
desc = "A lightweight scout-rifle used within the Sol Navy and Nanotrasen Emergency Response Teams. Equipped with a scope and designed for medium to long range combat, with medium stopping power. Chambered in 5.56 rounds."
|
||||
icon_state = "w556rifle"
|
||||
item_state = "heavysniper"
|
||||
w_class = 4
|
||||
force = 10
|
||||
slot_flags = SLOT_BACK
|
||||
origin_tech = "combat=5;materials=3"
|
||||
caliber = "a556"
|
||||
recoil = 4
|
||||
load_method = MAGAZINE
|
||||
fire_sound = 'sound/weapons/Gunshot_DMR.ogg'
|
||||
max_shells = 20
|
||||
ammo_type = /obj/item/ammo_casing/a556/ap
|
||||
magazine_type = /obj/item/ammo_magazine/a556/ap
|
||||
accuracy = -1
|
||||
scoped_accuracy = 3
|
||||
recoil_wielded = 2
|
||||
accuracy_wielded = -1
|
||||
multi_aim = 0 //Definitely a fuck no. Being able to target one person at this range is plenty.
|
||||
|
||||
firemodes = list(
|
||||
list(name="semiauto", burst=1, fire_delay=0),
|
||||
list(name="2-round bursts", burst=2, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.5, 0.6))
|
||||
)
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/rifle/w556/verb/scope()
|
||||
set category = "Object"
|
||||
set name = "Use Scope"
|
||||
set popup_menu = 1
|
||||
|
||||
if(wielded)
|
||||
toggle_scope(2.0)
|
||||
else
|
||||
usr << "<span class='warning'>You can't look through the scope without stabilizing the rifle!</span>"
|
||||
Reference in New Issue
Block a user