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

[MIRROR] Ports tgstation/tgstation/pull/15673 (#9270)

Browse Source 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-10-20 14:08:28 -07:00
committed by GitHub
parent a2efb04e10
commit 45025bd128
80 changed files with 585 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,7 +329,7 @@
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4)
projectile_type = /obj/item/projectile/beam/sniper
slot_flags = SLOT_BACK
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
//Begin CHOMPstation Edit for making this thing not trash
//battery_lock = 0
charge_cost = 360
@@ -341,7 +341,7 @@
one_handed_penalty = 60 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
//End CHOMP Edit.
/obj/item/gun/energy/sniperrifle/ui_action_click()
/obj/item/gun/energy/sniperrifle/ui_action_click(mob/user, actiontype)
scope()
/obj/item/gun/energy/sniperrifle/verb/scope()
@@ -439,7 +439,7 @@
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_POWER = 3)
projectile_type = /obj/item/projectile/beam/sniper
slot_flags = SLOT_BACK
action_button_name = "Aim Down Sights"
actions_types = list(/datum/action/item_action/aim_down_sights)
charge_cost = 2400
fire_delay = 20
force = 8
@@ -449,7 +449,7 @@
charge_meter = FALSE
var/scope_multiplier = 1.5
/obj/item/gun/energy/monorifle/ui_action_click()
/obj/item/gun/energy/monorifle/ui_action_click(mob/user, actiontype)
sights()
/obj/item/gun/energy/monorifle/verb/sights()

2
code/modules/projectiles/guns/energy/protector_vr.dm
View File

@@ -29,7 +29,7 @@
light_state = "prot_light"
flight_x_offset = 0
flight_y_offset = 0
action_button_name = "Toggle gun-light"
actions_types = list(/datum/action/item_action/toggle_gunlight)
var/gun_light_icon = TRUE
var/gun_light_on = FALSE
var/brightness_on = 5

4
code/modules/projectiles/guns/energy/pump.dm
View File

@@ -177,7 +177,7 @@
item_state = "lsniper"
item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper")
wielded_item_state = "lsniper-wielded"
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
w_class = ITEMSIZE_LARGE
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
accuracy = -15 //better than most snipers but still has penalty
@@ -192,7 +192,7 @@
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="riflestun", charge_cost = 200),
)
/obj/item/gun/energy/locked/frontier/rifle/ui_action_click()
/obj/item/gun/energy/locked/frontier/rifle/ui_action_click(mob/user, actiontype)
scope()
/obj/item/gun/energy/locked/frontier/rifle/verb/scope()

2
code/modules/projectiles/guns/energy/pump_ch.dm
View File

@@ -249,7 +249,7 @@
item_state = "sniper"
item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper")
wielded_item_state = "lsniper-wielded"
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
w_class = ITEMSIZE_LARGE
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
accuracy = -15 //better than most snipers but still has penalty

6
code/modules/projectiles/guns/magnetic/bore.dm
View File

@@ -173,7 +173,7 @@
power_cost = 100
ammo_material = MAT_PHORON
action_button_name = "Toggle internal generator"
actions_types = list(/datum/action/item_action/toggle_internal_generator)
var/generator_state = GEN_OFF
var/datum/looping_sound/small_motor/soundloop
@@ -204,8 +204,8 @@
QDEL_NULL(soundloop)
. = ..()
/obj/item/gun/magnetic/matfed/phoronbore/ui_action_click()
toggle_generator(usr)
/obj/item/gun/magnetic/matfed/phoronbore/ui_action_click(mob/user, actiontype)
toggle_generator(user)
/obj/item/gun/magnetic/matfed/phoronbore/process()
if(generator_state && !mat_storage)

2
code/modules/projectiles/guns/projectile/boltaction.dm
View File

@@ -141,7 +141,7 @@
action_sound = 'sound/weapons/riflebolt.ogg'
pump_animation = "scoped-boltaction-cycling"
/obj/item/gun/projectile/shotgun/pump/rifle/ui_action_click()
/obj/item/gun/projectile/shotgun/pump/rifle/ui_action_click(mob/user, actiontype)
scope()
/obj/item/gun/projectile/shotgun/pump/rifle/verb/scope()

6
code/modules/projectiles/guns/projectile/shotgun_vr.dm
View File

@@ -37,7 +37,7 @@
projectile_type = /obj/item/projectile/bullet/shotgun
one_handed_penalty = 30 //You madman, one-handing a 12g shotgun.
recoil = 5 //Unfold the damn stock you fool!
action_button_name = "Toggle stock"
actions_types = list(/datum/action/item_action/toggle_stock)
var/stock = FALSE
@@ -69,7 +69,7 @@
H.update_inv_r_hand()
playsound(src, 'sound/weapons/targeton.ogg', 50, 1)
user.update_action_buttons()
user.update_action_buttons_icon()
/obj/item/gun/projectile/shotgun/compact/verb/verb_toggle_stock(mob/user as mob)
set category = "Object"
@@ -94,7 +94,7 @@
else
to_chat(usr, span_notice("You cannot do this in your current state."))
/obj/item/gun/projectile/shotgun/compact/ui_action_click()
/obj/item/gun/projectile/shotgun/compact/ui_action_click(mob/unused_user, actiontype)
var/mob/living/user = loc
if(!isliving(user))
return

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

@@ -9,7 +9,7 @@
w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10
slot_flags = SLOT_BACK
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
caliber = "14.5mm"
recoil = 5 //extra kickback
@@ -63,7 +63,7 @@
return
..()
/obj/item/gun/projectile/heavysniper/ui_action_click()
/obj/item/gun/projectile/heavysniper/ui_action_click(mob/user, actiontype)
scope()
/obj/item/gun/projectile/heavysniper/verb/scope()
@@ -84,7 +84,7 @@
w_class = ITEMSIZE_HUGE // So it can't fit in a backpack.
force = 10
slot_flags = SLOT_BACK // Needs a sprite.
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
caliber = "7.62mm"
load_method = MAGAZINE
@@ -102,7 +102,7 @@
else
icon_state = "SVD-empty"
/obj/item/gun/projectile/SVD/ui_action_click()
/obj/item/gun/projectile/SVD/ui_action_click(mob/user, actiontype)
scope()
/obj/item/gun/projectile/SVD/verb/scope()

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

@@ -272,7 +272,7 @@
auto_loading_type = CLOSED_BOLT
muzzle_velocity = 810
w_class = ITEMSIZE_HUGE
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
accuracy = -30
scoped_accuracy = 50
one_handed_penalty = 70
@@ -529,7 +529,7 @@
name = "Scoped Mosin Nagant"
icon_state = "scopedmosin"
desc = "A reproduction of some old russian bolt-action rifle from some backwater rimworld. Smells strongly of cosmoline. The inscriptions on it are in pan-slavic. This one has a scope attached to it. Chambered in 7.62x54mmR."
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
accuracy = -15
scoped_accuracy = 50
one_handed_penalty = 70
@@ -594,7 +594,7 @@
projectile_type = /obj/item/projectile/bullet/rifle/a338
load_method = MAGAZINE
muzzle_velocity = 936
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
accuracy = -30
scoped_accuracy = 50
w_class = ITEMSIZE_HUGE
@@ -631,7 +631,7 @@
projectile_type = /obj/item/projectile/bullet/rifle/a145 //the old round type was ass
load_method = MAGAZINE
muzzle_velocity = 825
action_button_name = "Use Scope"
actions_types = list(/datum/action/item_action/use_scope)
accuracy = -60
scoped_accuracy = 15
w_class = ITEMSIZE_HUGE