Commit 31a66103 authored by Intigracy's avatar Intigracy Committed by clusterfack
Browse files

weakened becomes knockdown (which is what it does) (#12466)

* weakened becomes knockdown

* CRUISE CONTROL FOR COOL

* there's a proc for that

* use the procs luke

* shitcode
parent da64806b
......@@ -632,7 +632,7 @@ var/list/global_mutations = list() // list of hidden mutation things
//Bitflags defining which status effects could be or are inflicted on a mob
#define CANSTUN 1
#define CANWEAKEN 2
#define CANKNOCKDOWN 2
#define CANPARALYSE 4
#define CANPUSH 8
#define GODMODE 4096
......
......@@ -68,8 +68,8 @@ atom/movable/Move() //Hackish
H.apply_damage(0.5*damage, BRUTE, "r_leg")
H.apply_damage(0.5*damage, BRUTE, "l_arm")
H.apply_damage(0.5*damage, BRUTE, "r_arm")
H:weakened = max(H:weakened,2)
H:updatehealth()
H.SetKnockdown(max(H.knockdown,2))
H.updatehealth()
return ..()
attackby()
......
......@@ -54,13 +54,13 @@ mob/proc/airflow_stun()
return 0
if(last_airflow_stun > world.time - zas_settings.Get(/datum/ZAS_Setting/airflow_stun_cooldown))
return 0
if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
if(!(status_flags & CANSTUN) && !(status_flags & CANKNOCKDOWN))
to_chat(src, "<span class='notice'>You stay upright as the air rushes past you.</span>")
return 0
if(weakened <= 0)
if(knockdown <= 0)
to_chat(src, "<span class='warning'>The sudden rush of air knocks you over!</span>")
SetWeakened(5)
SetKnockdown(5)
last_airflow_stun = world.time
return
......@@ -78,13 +78,13 @@ mob/living/carbon/human/airflow_stun()
if(shoes)
if(CheckSlip() < 1)
return 0
if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
if(!(status_flags & CANSTUN) && !(status_flags & CANKNOCKDOWN))
to_chat(src, "<span class='notice'>You stay upright as the air rushes past you.</span>")
return 0
if(weakened <= 0)
if(knockdown <= 0)
to_chat(src, "<span class='warning'>The sudden rush of air knocks you over!</span>")
SetWeakened(rand(1,5))
SetKnockdown(rand(1,5))
last_airflow_stun = world.time
return
......@@ -409,9 +409,9 @@ mob/airflow_hit(atom/A)
//playsound(get_turf(src), "smash.ogg", 25, 1, -1)
if(istype(A,/obj/item))
var/obj/item/item = A
SetWeakened(item.w_class)
SetKnockdown(item.w_class)
else
SetWeakened(rand(1,5))
SetKnockdown(rand(1,5))
. = ..()
obj/airflow_hit(atom/A)
......
......@@ -128,7 +128,7 @@
usr.update_inv_r_hand(0)
return
// ------- PARALYSIS, STUN, WEAKENED, DEAD, (And not AI) -------
// ------- PARALYSIS, STUN, KNOCKDOWN, DEAD, (And not AI) -------
if ((user.incapacitated() && !istype(usr, /mob/living/silicon/ai)))
return
......
......@@ -147,7 +147,7 @@ datum/shuttle_controller/proc/move_pod(var/start_type,var/end_type,var/direction
shake_camera(M, 10, 2) // unlocked_to, HOLY SHIT SHAKE THE ROOM
if(istype(M, /mob/living/carbon))
if(!M.locked_to)
M.Weaken(5)
M.Knockdown(5)
datum/shuttle_controller/emergency_shuttle
......
......@@ -41,13 +41,13 @@
H.vomit()
else
to_chat(affected_mob, "<span class='warning'>You gag as you want to throw up, but there's nothing in your stomach!</span>")
affected_mob.Weaken(10)
affected_mob.Knockdown(10)
affected_mob.adjustToxLoss(3)
if(stage > 3)
if(prob(1) && ishuman(affected_mob))
var/mob/living/carbon/human/H = affected_mob
to_chat(H, "<span class='warning'>Your abdomen is a world of pain!</span>")
H.Weaken(10)
H.Knockdown(10)
H.op_stage.appendix = 2.0
var/datum/organ/external/groin = H.get_organ(LIMB_GROIN)
......
......@@ -425,7 +425,7 @@
if(!src.stable)
if(istype(M, /mob/living/carbon))
M.Weaken(3)
M.Knockdown(3)
else
shake_camera(M, 3, 1) // buckled, not a lot of shaking
......
......@@ -241,7 +241,7 @@
step(H, H.dir)
H.visible_message("<span class='warning'>[H] was tripped by the bolas!</span>","<span class='warning'>Your legs have been tangled!</span>");
H.Stun(2) //used instead of setting damage in vars to avoid non-human targets being affected
H.Weaken(4)
H.Knockdown(4)
H.legcuffed = src //applies legcuff properties inherited through legcuffs
src.forceMove(H)
H.update_inv_legcuffed()
......
......@@ -460,7 +460,7 @@
target.visible_message("<span class='warning'><b>[target.name]</b> takes a huge leap!</span>")
playsound(target.loc, 'sound/weapons/thudswoosh.ogg', 50, 1)
if(failed_leap)
target.Weaken(5)
target.Knockdown(5)
target.Stun(5)
target.visible_message("<span class='warning'> \the [usr] attempts to leap away but is slammed back down to the ground!</span>",
"<span class='warning'>You attempt to leap away but are suddenly slammed back down to the ground!</span>",
......@@ -482,16 +482,16 @@
if (M_FAT in target.mutations && prob(66))
target.visible_message("<span class='warning'><b>[target.name]</b> crashes due to their heavy weight!</span>")
//playsound(usr.loc, 'zhit.wav', 50, 1)
target.weakened += 10
target.stunned += 5
target.AdjustKnockdown(10)
target.AdjustStunned(5)
target.layer = prevLayer
if (istype(target.loc,/obj/))
var/obj/container = target.loc
to_chat(target, "<span class='warning'>You leap and slam your head against the inside of [container]! Ouch!</span>")
target.paralysis += 3
target.weakened += 5
target.AdjustParalysis(3)
target.AdjustKnockdown(5)
container.visible_message("<span class='warning'><b>[container]</b> emits a loud thump and rattles a bit.</span>")
playsound(target.loc, 'sound/effects/bang.ogg', 50, 1)
var/wiggle = 6
......
......@@ -294,7 +294,7 @@
M.update_mutations() //update our mutation overlays
M.update_body()
to_chat(M, "<span class='warning'>You suddenly feel very weak.</span>")
M.Weaken(3)
M.Knockdown(3)
M.emote("collapse")
*/
/datum/dna/gene/basic/xray
......
......@@ -54,7 +54,7 @@ Obviously, requires DNA2.
M.update_mutations() //update our mutation overlays
M.update_body()
to_chat(M, "<span class='warning'>You suddenly feel very weak.</span>")
M.Weaken(3)
M.Knockdown(3)
M.emote("collapse")
/spell/targeted/genetic/hulk
......
......@@ -685,7 +685,7 @@
C.stat = 0
C.SetParalysis(0)
C.SetStunned(0)
C.SetWeakened(0)
C.SetKnockdown(0)
C.lying = 0
C.update_canmove()
......@@ -1054,7 +1054,7 @@ var/list/datum/dna/hivemind_bank = list()
return
to_chat(target, "<span class='userdanger'>Your muscles begin to painfully tighten.</span>")
target.Weaken(20)
target.Knockdown(20)
feedback_add_details("changeling_powers", "PS")
return 1
......
......@@ -210,7 +210,7 @@
M.Sleeping(300)//putting them to sleep for 5 minutes.
to_chat(usr, "<span class='danger'>The ritual didn't work! Looks like this person just isn't suited to be part of our cult.</span>")
to_chat(usr, "<span class='notice'>It appears that the ritual at least put the target to sleep. Try to figure a way to deal with them before they wake up.</span>")
else if(M.weakened)
else if(M.knockdown)
to_chat(usr, "<span class='danger'>The ritual didn't work, either something is disrupting it, or this person just isn't suited to be part of our cult.</span>")
to_chat(usr, "<span class='danger'>You have to restrain him before the talisman's effects wear off!</span>")
to_chat(M, "<span class='sinister'>Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.</span>")
......@@ -1288,13 +1288,13 @@
C.flash_eyes(visual = 1)
if(C.stuttering < 1 && (!(M_HULK in C.mutations)))
C.stuttering = 1
C.Weaken(1)
C.Knockdown(1)
C.Stun(1)
C.visible_message("<span class='warning'>The rune explodes in a bright flash.</span>")
else if(issilicon(L))
var/mob/living/silicon/S = L
S.Weaken(5)
S.Knockdown(5)
S.visible_message("<span class='warning'>BZZZT... The rune has exploded in a bright flash.</span>")
qdel(src)
return
......
......@@ -188,14 +188,14 @@
usr.visible_message("<span class='danger'>[usr] invokes a talisman at [T]</span>")
if(issilicon(T))
T.Weaken(15)
T.Knockdown(15)
else if(iscarbon(T))
var/mob/living/carbon/C = T
C.flash_eyes(visual = 1)
if (!(M_HULK in C.mutations))
C.silent += 15
C.Weaken(25)
C.Knockdown(25)
C.Stun(25)
return
......
......@@ -181,7 +181,7 @@
if(!istype(M.current,/mob/living))
continue
if(M.current.stat!=2)
M.current.Weaken(10)
M.current.Knockdown(10)
M.current.flash_eyes(visual = 1)
tcheck(80,1)
......
......@@ -39,7 +39,7 @@
/mob/living/carbon/human/krampus/Stun(amount)
return
/mob/living/carbon/human/krampus/Weaken(amount)
/mob/living/carbon/human/krampus/Knockdown(amount)
return
/mob/living/carbon/human/krampus/Paralyse(amount)
......
......@@ -287,7 +287,7 @@
var/mob/living/carbon/C = hit_atom
if(C.stuttering < 1 && (!(M_HULK in C.mutations)))
C.stuttering = 1
C.Weaken(1)
C.Knockdown(1)
C.Stun(1)
playsound(C.loc, "swing_hit", 50, 1)
if(C.bodytemperature >= T0C+30)
......
......@@ -250,10 +250,10 @@
M.Stun(2)
if(0)
M.Stun(4)
M.Weaken(10)
M.Knockdown(10)
if(-1)
M.Stun(7)
M.Weaken(15)
M.Knockdown(15)
if(ear_safety < 2)
switch(ear_safety)
......
......@@ -96,9 +96,9 @@
if(!M)
return
if(M.current.vampire_power(0, 1))
M.current.weakened = 0
M.current.stunned = 0
M.current.paralysis = 0
M.current.SetKnockdown(0)
M.current.SetStunned(0)
M.current.SetParalysis(0)
M.current.reagents.clear_reagents()
//M.vampire.bloodusable -= 10
to_chat(M.current, "<span class='notice'>You flush your system with clean blood and remove any incapacitating effects.</span>")
......@@ -181,7 +181,7 @@
spawn(1800)
if(M && M.current)
M.current.verbs += /client/proc/vampire_hypnotise
var/enhancements = ((C.weakened ? 2 : 0) + (C.stunned ? 1 : 0) + (C.sleeping || C.paralysis ? 3 : 0))
var/enhancements = ((C.knockdown ? 2 : 0) + (C.stunned ? 1 : 0) + (C.sleeping || C.paralysis ? 3 : 0))
if(do_mob(M.current, C, 10 - enhancements))
M.current.remove_vampire_blood(10)
if(C.mind && C.mind.vampire)
......@@ -276,7 +276,7 @@
dist_mobs -= close_mobs //So they don't get double affected.
for(var/mob/living/carbon/C in close_mobs)
C.Stun(8)
C.Weaken(8)
C.Knockdown(8)
C.stuttering += 20
if(!C.blinded)
C.blinded = 1
......@@ -285,7 +285,7 @@
var/distance_value = max(0, abs((get_dist(C, M.current)-3)) + 1)
C.Stun(distance_value)
if(distance_value > 1)
C.Weaken(distance_value)
C.Knockdown(distance_value)
C.stuttering += 5+distance_value * ((VAMP_CHARISMA in M.vampire.powers) ? 2 : 1) //double stutter time with Charisma
if(!C.blinded)
C.blinded = 1
......@@ -329,7 +329,7 @@
if(!C.vampire_affected(M))
continue
to_chat(C, "<span class='danger'><font size='3'>You hear a ear piercing shriek and your senses dull!</font></span>")
C.Weaken(8)
C.Knockdown(8)
C.ear_deaf = 20
C.stuttering = 20
C.Stun(8)
......
......@@ -486,7 +486,7 @@
/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob)
..()
to_chat(user, "<span class='warning'>You're knocked down!</span>")
user.Weaken(20)
user.Knockdown(20)
/obj/item/weapon/spellbook/oneuse/horsemask
spell = /spell/targeted/equip_item/horsemask
......@@ -710,24 +710,24 @@
spellname = "sculpting"
icon_state = "bookstatue"
desc = "This book is as dense as a rock."
/obj/item/weapon/spellbook/oneuse/ringoffire
spell = /spell/aoe_turf/ring_of_fire
spellname = "ring of fire"
icon_state = "bookring"
desc = "The cover of this book is much warmer than the pages within."
/obj/item/weapon/spellbook/oneuse/ringoffire/recoil(mob/living/carbon/user as mob)
user.adjust_fire_stacks(10)
user.IgniteMob()
to_chat(user, "<span class = 'warning'>The book sets you alight!</span>")
/obj/item/weapon/spellbook/oneuse/mirror_of_pain
spell = /spell/mirror_of_pain
spellname = "pain mirror"
icon_state = "bookmirror"
desc = "The cover of the book seems to stare back at you."
/obj/item/weapon/spellbook/oneuse/mirror_of_pain/recoil(mob/living/carbon/user as mob)
scramble(1, user, 100)
to_chat(user, "<span class = 'warning'>Your reflection becomes warped and distorted!</span>")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment