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

fix guns

Browse Source
This commit is contained in:
silicons
2020-07-23 09:56:38 -07:00
parent 38a9e89687
commit 2eb6f0467d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/_ammunition.dm
+2 -1
View File
@@ -16,7 +16,8 @@
var/variance = 0 //Variance for inaccuracy fundamental to the casing var/variance = 0 //Variance for inaccuracy fundamental to the casing
var/randomspread = 0 //Randomspread for automatics var/randomspread = 0 //Randomspread for automatics
var/delay = 0 //Delay for energy weapons var/delay = 0 //Delay for energy weapons
var/click_cooldown_override = 0 //Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown. /// Override this to make the gun check for a different cooldown rather than CLICK_CD_RANGE, which is 4 deciseconds.
var/click_cooldown_override
var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the ammo is fired. var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the ammo is fired.
var/heavy_metal = TRUE var/heavy_metal = TRUE
var/harmful = TRUE //pacifism check for boolet, set to FALSE if bullet is non-lethal var/harmful = TRUE //pacifism check for boolet, set to FALSE if bullet is non-lethal
code/modules/projectiles/ammunition/_firing.dm
+1
View File
@@ -16,6 +16,7 @@
AddComponent(/datum/component/pellet_cloud, projectile_type, pellets) AddComponent(/datum/component/pellet_cloud, projectile_type, pellets)
SEND_SIGNAL(src, COMSIG_PELLET_CLOUD_INIT, target, user, fired_from, randomspread, spread, zone_override, params, distro) SEND_SIGNAL(src, COMSIG_PELLET_CLOUD_INIT, target, user, fired_from, randomspread, spread, zone_override, params, distro)
user.DelayNextAction(considered_action = TRUE, immediate = FALSE)
user.newtonian_move(get_dir(target, user)) user.newtonian_move(get_dir(target, user))
update_icon() update_icon()
return 1 return 1
code/modules/projectiles/gun.dm
-1
View File
@@ -169,7 +169,6 @@
. = ..() . = ..()
if(!CheckAttackCooldown(user, target)) if(!CheckAttackCooldown(user, target))
return return
user.DelayNextAction()
process_afterattack(target, user, flag, params) process_afterattack(target, user, flag, params)
/obj/item/gun/proc/process_afterattack(atom/target, mob/living/user, flag, params) /obj/item/gun/proc/process_afterattack(atom/target, mob/living/user, flag, params)