This commit is contained in:
silicons
2020-07-23 00:25:06 -07:00
parent 910290edcf
commit 3a38344a04
3 changed files with 2 additions and 10 deletions
@@ -17,7 +17,7 @@
/obj/screen/action_bar/proc/update_to_mob(mob/living/L) /obj/screen/action_bar/proc/update_to_mob(mob/living/L)
return FALSE return FALSE
/datum/hud/var/obj/screen/action_bar/clickdelay /datum/hud/var/obj/screen/action_bar/clickdelay/clickdelay
/obj/screen/action_bar/clickdelay /obj/screen/action_bar/clickdelay
name = "click delay" name = "click delay"
@@ -41,7 +41,7 @@
icon = 'icons/effects/progessbar.dmi' icon = 'icons/effects/progessbar.dmi'
icon_state = "prog_bar_100" icon_state = "prog_bar_100"
/obj/screen/clickdelay/proc/update_to_mob(mob/living/L) /obj/screen/action_bar/clickdelay/proc/update_to_mob(mob/living/L)
var/diff = L.next_resist - L.last_resist var/diff = L.next_resist - L.last_resist
var/left = L.next_resist - world.time var/left = L.next_resist - world.time
if(left < 0 || diff < 0) if(left < 0 || diff < 0)
-5
View File
@@ -144,7 +144,6 @@
id = "tased" id = "tased"
alert_type = null alert_type = null
var/movespeed_mod = /datum/movespeed_modifier/status_effect/tased var/movespeed_mod = /datum/movespeed_modifier/status_effect/tased
var/nextmove_modifier = 1
var/stamdmg_per_ds = 0 //a 20 duration would do 20 stamdmg, disablers do 24 or something var/stamdmg_per_ds = 0 //a 20 duration would do 20 stamdmg, disablers do 24 or something
var/last_tick = 0 //fastprocess processing speed is a goddamn sham, don't trust it. var/last_tick = 0 //fastprocess processing speed is a goddamn sham, don't trust it.
@@ -173,13 +172,9 @@
C.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing. C.adjustStaminaLoss(max(0, stamdmg_per_ds * diff)) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing.
last_tick = world.time last_tick = world.time
/datum/status_effect/electrode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y
return nextmove_modifier
/datum/status_effect/electrode/no_combat_mode /datum/status_effect/electrode/no_combat_mode
id = "tased_strong" id = "tased_strong"
movespeed_mod = /datum/movespeed_modifier/status_effect/tased/no_combat_mode movespeed_mod = /datum/movespeed_modifier/status_effect/tased/no_combat_mode
nextmove_modifier = 2
blocks_combatmode = TRUE blocks_combatmode = TRUE
stamdmg_per_ds = 1 stamdmg_per_ds = 1
-3
View File
@@ -324,13 +324,10 @@
/mob/living/carbon/resist_restraints() /mob/living/carbon/resist_restraints()
var/obj/item/I = null var/obj/item/I = null
var/type = 0
if(handcuffed) if(handcuffed)
I = handcuffed I = handcuffed
type = 1
else if(legcuffed) else if(legcuffed)
I = legcuffed I = legcuffed
type = 2
if(I) if(I)
MarkResistTime() MarkResistTime()
cuff_resist(I) cuff_resist(I)