mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 14:37:04 +01:00
Redo of jitteriness and dizziness.
Fixes #2923 Conflicts: code/game/gamemodes/changeling/changeling_powers.dm code/game/mecha/equipment/weapons/weapons.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/mob.dm code/modules/mob/mob_defines.dm code/modules/reagents/Chemistry-Reagents.dm
This commit is contained in:
@@ -762,7 +762,7 @@ var/list/datum/dna/hivemind_bank = list()
|
||||
T << "<span class='danger'>You feel a small prick and your chest becomes tight.</span>"
|
||||
T.silent = 10
|
||||
T.Paralyse(10)
|
||||
T.make_jittery(1000)
|
||||
T.Jitter(1000)
|
||||
if(T.reagents) T.reagents.add_reagent("lexorin", 40)
|
||||
feedback_add_details("changeling_powers","DTHS")
|
||||
return 1
|
||||
@@ -785,4 +785,4 @@ var/list/datum/dna/hivemind_bank = list()
|
||||
changeling.absorbed_dna |= T.dna
|
||||
|
||||
feedback_add_details("changeling_powers","ED")
|
||||
return 1
|
||||
return 1
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
/obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob)
|
||||
if(!iscultist(user))
|
||||
user << "\red An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly."
|
||||
user.make_dizzy(120)
|
||||
user.Dizzy(120)
|
||||
|
||||
|
||||
/obj/item/clothing/head/culthood
|
||||
|
||||
@@ -220,7 +220,7 @@
|
||||
C.ear_deaf = 20
|
||||
C.stuttering = 20
|
||||
C.Stun(8)
|
||||
C.make_jittery(150)
|
||||
C.Jitter(150)
|
||||
for(var/obj/structure/window/W in oview(3))
|
||||
new W.shardtype(W.loc)
|
||||
if(W.reinf) new /obj/item/stack/rods(W.loc)
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
if(!istype(target, /obj) && !istype(target, /mob)) return
|
||||
if(istype(target, /mob))
|
||||
var/mob/M = target
|
||||
M.make_dizzy(3)
|
||||
M.Dizzy(3)
|
||||
M.adjustBruteLoss(1)
|
||||
M.updatehealth()
|
||||
for (var/mob/V in viewers(src))
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
M.Stun(10)
|
||||
M.Paralyse(4)
|
||||
else
|
||||
M.make_jittery(500)
|
||||
M.Jitter(500)
|
||||
///else the mousetraps are useless
|
||||
if(istype(M, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = M
|
||||
|
||||
Reference in New Issue
Block a user