cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports Sniper Rifle QOL from Polaris

Browse Source
This commit is contained in:
Unknown
2020-03-29 21:36:27 -04:00
parent 58f031cbf7
commit 9f2d3f522d
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -166,6 +166,7 @@
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4) origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
projectile_type = /obj/item/projectile/beam/sniper projectile_type = /obj/item/projectile/beam/sniper
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
action_button_name = "Use Scope"
battery_lock = 1 battery_lock = 1
charge_cost = 600 charge_cost = 600
fire_delay = 35 fire_delay = 35
@@ -176,6 +177,9 @@
// requires_two_hands = 1 // requires_two_hands = 1
// one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand. // one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
/obj/item/weapon/gun/energy/sniperrifle/ui_action_click()
scope()
/obj/item/weapon/gun/energy/sniperrifle/verb/scope() /obj/item/weapon/gun/energy/sniperrifle/verb/scope()
set category = "Object" set category = "Object"
set name = "Use Scope" set name = "Use Scope"
@@ -192,6 +196,7 @@
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_POWER = 3) origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_POWER = 3)
projectile_type = /obj/item/projectile/beam/sniper projectile_type = /obj/item/projectile/beam/sniper
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
action_button_name = "Aim Down Sights"
charge_cost = 1300 charge_cost = 1300
fire_delay = 20 fire_delay = 20
force = 8 force = 8
@@ -200,6 +205,9 @@
scoped_accuracy = 15 scoped_accuracy = 15
var/scope_multiplier = 1.5 var/scope_multiplier = 1.5
/obj/item/weapon/gun/energy/monorifle/ui_action_click()
sights()
/obj/item/weapon/gun/energy/monorifle/verb/sights() /obj/item/weapon/gun/energy/monorifle/verb/sights()
set category = "Object" set category = "Object"
set name = "Aim Down Sights" set name = "Aim Down Sights"

8
code/modules/projectiles/guns/projectile/sniper.dm
View File

@@ -8,6 +8,7 @@
w_class = ITEMSIZE_HUGE // So it can't fit in a backpack. w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10 force = 10
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
action_button_name = "Use Scope"
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
caliber = "14.5mm" caliber = "14.5mm"
recoil = 5 //extra kickback recoil = 5 //extra kickback
@@ -61,6 +62,9 @@
return return
..() ..()
/obj/item/weapon/gun/projectile/heavysniper/ui_action_click()
scope()
/obj/item/weapon/gun/projectile/heavysniper/verb/scope() /obj/item/weapon/gun/projectile/heavysniper/verb/scope()
set category = "Object" set category = "Object"
set name = "Use Scope" set name = "Use Scope"
@@ -78,6 +82,7 @@
w_class = ITEMSIZE_HUGE // So it can't fit in a backpack. w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10 force = 10
slot_flags = SLOT_BACK // Needs a sprite. slot_flags = SLOT_BACK // Needs a sprite.
action_button_name = "Use Scope"
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
caliber = "7.62mm" caliber = "7.62mm"
load_method = MAGAZINE load_method = MAGAZINE
@@ -96,6 +101,9 @@
else else
icon_state = "SVD-empty" icon_state = "SVD-empty"
/obj/item/weapon/gun/projectile/SVD/ui_action_click()
scope()
/obj/item/weapon/gun/projectile/SVD/verb/scope() /obj/item/weapon/gun/projectile/SVD/verb/scope()
set category = "Object" set category = "Object"
set name = "Use Scope" set name = "Use Scope"