shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15229 from Hatterhat/perhaps-i-was-a-bit-too-harsh

Browse Source 
vareditable clip reloading delay for shotguns
This commit is contained in:
silicons
2021-10-11 20:46:06 -07:00
committed by GitHub
parent 789bbbdeb0 02abdd4eef
commit f623d6e7eb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic/shotgun.dm
+3 -1
View File
@@ -11,6 +11,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/shot mag_type = /obj/item/ammo_box/magazine/internal/shot
casing_ejector = FALSE casing_ejector = FALSE
var/recentpump = 0 // to prevent spammage var/recentpump = 0 // to prevent spammage
var/clip_delay = CLICK_CD_MELEE
weapon_weight = WEAPON_HEAVY weapon_weight = WEAPON_HEAVY
sawn_item_state = "sawnshotgun" sawn_item_state = "sawnshotgun"
@@ -24,7 +25,8 @@
playsound(user, 'sound/weapons/shotguninsert.ogg', 60, 1) playsound(user, 'sound/weapons/shotguninsert.ogg', 60, 1)
A.update_icon() A.update_icon()
update_icon() update_icon()
user.SetNextAction(CLICK_CD_MELEE) if(istype(A, /obj/item/ammo_box))
user.SetNextAction(clip_delay)
/obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0) /obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0)
return ..() //changed argument value return ..() //changed argument value