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

compile

Browse Source
This commit is contained in:
kevinz000
2020-01-27 02:55:32 -07:00
parent d4d315b447
commit 4883b36576
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+6 -1
View File
@@ -237,7 +237,7 @@
sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread), 1)
else //Smart spread
sprd = round((((rand_spr/burst_size) * iteration) - (0.5 + (rand_spr * 0.25))) * (randomized_gun_spread + randomized_bonus_spread), 1)
before_firing(target,user)
if(!chambered.fire_casing(target, user, params, ,suppressed, zone_override, sprd, src))
shoot_with_empty_chamber(user)
firing_burst = FALSE
@@ -281,6 +281,7 @@
else
if(chambered)
sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread))
before_firing(target,user)
if(!chambered.fire_casing(target, user, params, , suppressed, zone_override, sprd, src))
shoot_with_empty_chamber(user)
return
@@ -466,6 +467,10 @@
qdel(pin)
pin = new /obj/item/firing_pin
//Happens before the actual projectile creation
/obj/item/gun/proc/before_firing(atom/target,mob/user)
return
/////////////
// ZOOMING //
/////////////
code/modules/projectiles/guns/energy/dueling.dm
+7 -7
View File
@@ -255,13 +255,13 @@
/obj/item/ammo_casing/energy/duel
e_cost = 0
projectile_type = /obj/projectile/energy/duel
projectile_type = /obj/item/projectile/energy/duel
var/setting
var/hugbox = DUEL_HUGBOX_NONE
/obj/item/ammo_casing/energy/duel/ready_proj(atom/target, mob/living/user, quiet, zone_override)
. = ..()
var/obj/projectile/energy/duel/D = BB
var/obj/item/projectile/energy/duel/D = BB
D.setting = setting
D.hugbox = hugbox
D.update_icon()
@@ -275,15 +275,15 @@
//Projectile
/obj/projectile/energy/duel
/obj/item/projectile/energy/duel
name = "dueling beam"
icon_state = "declone"
reflectable = FALSE
is_reflectable = FALSE
homing = TRUE
var/setting
var/hugbox = DUEL_HUGBOX_NONE
/obj/projectile/energy/duel/update_icon()
/obj/item/projectile/energy/duel/update_icon()
. = ..()
switch(setting)
if(DUEL_SETTING_A)
@@ -293,7 +293,7 @@
if(DUEL_SETTING_C)
color = "blue"
/obj/projectile/energy/duel/on_hit(atom/target, blocked)
/obj/item/projectile/energy/duel/on_hit(atom/target, blocked)
. = ..()
var/turf/T = get_turf(target)
var/obj/effect/temp_visual/dueling_chaff/C = locate() in T
@@ -345,7 +345,7 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_w_class = WEIGHT_CLASS_SMALL
STR.max_items = 2
STR.set_holdable(list(/obj/item/gun/energy/dueling))
STR.can_hold = typecacheof(/obj/item/gun/energy/dueling)
/obj/item/storage/lockbox/dueling/update_icon()
cut_overlays()