Skip to content

Commit cf40e0f

Browse files
authored
Merge pull request #1611 from Lamasmaster/raisedeyebrowemoji
Seizure moment
2 parents c152759 + 61d3cfe commit cf40e0f

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

code/modules/boh/ascent2/firearms.dm

+17
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@
1515
firemodes = list(
1616
list(mode_name="primary", projectile_type = /obj/item/projectile/beam/particle/defence),
1717
)
18+
var/windup = 5
19+
20+
/obj/item/weapon/gun/energy/particle/support/handle_post_fire(mob/user, atom/target)
21+
..()
22+
23+
/obj/item/weapon/gun/energy/particle/support/afterattack(atom/A, mob/living/user, adjacent, params)
24+
if(adjacent) return
25+
26+
if(!user.aiming)
27+
user.aiming = new(user)
28+
29+
if(windup > 0)
30+
if(do_after(user, windup)) // Do the windup.
31+
Fire(A,user,params) //Otherwise, fire normally.
32+
else
33+
Fire(A,user,params) //Otherwise, fire normally.
34+
1835

1936
/obj/item/weapon/gun/energy/drone_particle//near identical to standard one, just without the limit as it's not a subpath
2037
name = "particle lance"

code/modules/boh/ascent2/projectiles.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
. = ..()
1414
if(isliving(target))
1515
var/mob/living/L = target
16-
to_chat(target, SPAN_WARNING("You feel incredible pain, as if something is invading your mind!"))
17-
L.seizure()//Which is why, if it does work, it'll drop a target in one hit for cuffing.
16+
to_chat(target, SPAN_WARNING("You feel your muscles locking up, preventing you from moving!"))
17+
L.Paralyse(2 SECONDS) //It's actually 20 ticks (around half a minute) but baycode funny
1818

1919
/////////
2020
//lethals

0 commit comments

Comments
 (0)