mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
Reworks the syndicate chainsaw (#18252)
* Reworks the syndicate chainsaw * fixes merge conflict * not work on dead people * makes stun absorption removal respect stamina * requested changes
This commit is contained in:
@@ -115,7 +115,7 @@ Difficulty: Medium
|
||||
/obj/item/melee/energy/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
|
||||
target.add_stun_absorption("miner", 10, INFINITY)
|
||||
..()
|
||||
target.stun_absorption -= "miner"
|
||||
target.remove_stun_absorption("miner")
|
||||
|
||||
/obj/item/projectile/kinetic/miner
|
||||
damage = 20
|
||||
|
||||
@@ -853,6 +853,15 @@ moving up or down retains their old lying angle
|
||||
priority_absorb_key["stuns_absorbed"] += amount
|
||||
return TRUE
|
||||
|
||||
/mob/living/proc/remove_stun_absorption(id_flag)
|
||||
stun_absorption -= id_flag
|
||||
if(ishuman(src))
|
||||
var/mob/living/carbon/human/H = src
|
||||
if(H.getStaminaLoss() <= 100)
|
||||
return
|
||||
H.enter_stamcrit()
|
||||
|
||||
|
||||
/mob/living/proc/set_shocked()
|
||||
flags_2 |= SHOCKED_2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user