cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes bloodbeam for real (#5553)

Browse Source 
* Fixes bloodbeam for real (#58855)

* Fixes bloodbeam for real

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-05-08 23:39:32 +01:00
committed by GitHub
co-authored by John Willard
parent cead216dc4
commit edca87a503
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/cult/cult_items.dm
+9 -9
View File
@@ -875,26 +875,26 @@
ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
/obj/item/blood_beam/afterattack(atom/A, mob/living/user, flag, params)
/obj/item/blood_beam/afterattack(atom/A, mob/living/user, proximity_flag, clickparams)
. = ..()
if(firing || charging)
return
var/C = user.client
if(ishuman(user) && C)
var/list/angle_vector = calculate_projectile_angle_and_pixel_offsets(user, params)
angle = angle_vector[1]
if(ishuman(user))
angle = Get_Angle(user, A)
else
qdel(src)
return
charging = TRUE
INVOKE_ASYNC(src, .proc/charge, user)
if(do_after(user, 90, target = user))
if(do_after(user, 9 SECONDS, target = user))
firing = TRUE
INVOKE_ASYNC(src, .proc/pewpew, user, params)
ADD_TRAIT(user, TRAIT_IMMOBILIZED, CULT_TRAIT)
INVOKE_ASYNC(src, .proc/pewpew, user, clickparams)
var/obj/structure/emergency_shield/cult/weak/N = new(user.loc)
if(do_after(user, 90, target = user))
if(do_after(user, 9 SECONDS, target = user))
user.Paralyze(40)
to_chat(user, "<span class='cult italic'>You have exhausted the power of this spell!</span>")
REMOVE_TRAIT(user, TRAIT_IMMOBILIZED, CULT_TRAIT)
firing = FALSE
if(N)
qdel(N)
@@ -917,7 +917,7 @@
if(O)
qdel(O)
/obj/item/blood_beam/proc/pewpew(mob/user, params)
/obj/item/blood_beam/proc/pewpew(mob/user, proximity_flag)
var/turf/targets_from = get_turf(src)
var/spread = 40
var/second = FALSE