mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
[MIRROR] Converts jittering to status effect, striking yet another mob level status value [MDB IGNORE] (#13534)
* Converts jittering to status effect, striking yet another mob level status value * mmkay * weh Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
co-authored by
MrMelbert
Gandalf
parent
4bc9446f21
commit
133b753507
@@ -420,7 +420,7 @@
|
||||
damage_type = BURN
|
||||
armor_flag = ENERGY
|
||||
range = 150
|
||||
jitter = 10
|
||||
jitter = 20 SECONDS
|
||||
var/obj/item/gun/energy/beam_rifle/gun
|
||||
var/structure_pierce_amount = 0 //All set to 0 so the gun can manually set them during firing.
|
||||
var/structure_bleed_coeff = 0
|
||||
|
||||
@@ -152,7 +152,8 @@
|
||||
var/unconscious = 0
|
||||
var/eyeblur = 0
|
||||
var/drowsy = 0
|
||||
var/jitter = 0
|
||||
/// Jittering applied on projectile hit
|
||||
var/jitter = 0 SECONDS
|
||||
/// Extra stamina damage applied on projectile hit (in addition to the main damage)
|
||||
var/stamina = 0
|
||||
/// Stuttering applied on projectile hit
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
damage = 5
|
||||
paralyze = 100
|
||||
stutter = 10 SECONDS
|
||||
jitter = 20
|
||||
jitter = 40 SECONDS
|
||||
range = 7
|
||||
icon_state = "spark"
|
||||
color = "#FFFF00"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nodamage = FALSE
|
||||
stamina = 80 // SKYRAT EDIT CHANGE
|
||||
stutter = 10 SECONDS
|
||||
jitter = 20
|
||||
jitter = 40 SECONDS
|
||||
hitsound = 'sound/weapons/taserhit.ogg'
|
||||
//range = 7 //ORIGINAL
|
||||
range = 5 //SKYRAT EDIT CHANGE - COMBAT
|
||||
@@ -26,7 +26,7 @@
|
||||
if(C.dna && C.dna.check_mutation(/datum/mutation/human/hulk))
|
||||
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
|
||||
else if((C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE))
|
||||
addtimer(CALLBACK(C, /mob/living/carbon.proc/do_jitter_animation, jitter), 5)
|
||||
addtimer(CALLBACK(C, /mob/living/carbon.proc/do_jitter_animation, 20), 5)
|
||||
|
||||
/obj/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
|
||||
do_sparks(1, TRUE, src)
|
||||
|
||||
Reference in New Issue
Block a user