From 31a66103af72ae2585ea8d9ad8a3dc46c0c807d3 Mon Sep 17 00:00:00 2001 From: Intigracy Date: Sun, 6 Nov 2016 12:41:50 -0800 Subject: [PATCH] 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 --- __DEFINES/setup.dm | 2 +- code/TriDimension/Turfs.dm | 4 ++-- code/ZAS/Airflow.dm | 16 +++++++-------- code/_onclick/oldcode.dm | 2 +- code/controllers/shuttle_controller.dm | 2 +- code/datums/diseases/appendicitis.dm | 4 ++-- code/datums/shuttle.dm | 2 +- code/defines/obj/weapon.dm | 2 +- code/game/dna/genes/goon_powers.dm | 10 +++++----- code/game/dna/genes/powers.dm | 2 +- code/game/dna/genes/vg_powers.dm | 2 +- .../gamemodes/changeling/changeling_powers.dm | 4 ++-- code/game/gamemodes/cult/runes.dm | 6 +++--- code/game/gamemodes/cult/talisman.dm | 4 ++-- .../endgame/supermatter_cascade/universe.dm | 2 +- code/game/gamemodes/endgame/xmas/krampus.dm | 2 +- code/game/gamemodes/endgame/xmas/snow.dm | 2 +- code/game/gamemodes/meteor/meteors.dm | 4 ++-- code/game/gamemodes/vampire/vampire_powers.dm | 14 ++++++------- code/game/gamemodes/wizard/spellbook.dm | 10 +++++----- code/game/machinery/Sleeper.dm | 4 ++-- code/game/machinery/bots/ed209bot.dm | 6 +++--- code/game/machinery/bots/mulebot.dm | 2 +- code/game/machinery/bots/secbot.dm | 6 +++--- .../machinery/computer/HolodeckControl.dm | 4 ++-- code/game/machinery/doors/airlock.dm | 2 +- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/flasher.dm | 6 +++--- code/game/machinery/transformer.dm | 4 ++-- .../mecha/equipment/tools/medical_tools.dm | 4 ++-- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/game/mecha/mecha.dm | 6 +++--- code/game/objects/effects/effect_system.dm | 2 +- code/game/objects/items.dm | 4 ++-- code/game/objects/items/devices/flash.dm | 6 +++--- .../items/devices/radio/electropack.dm | 2 +- .../objects/items/devices/traitordevices.dm | 2 +- code/game/objects/items/robot/robot_items.dm | 2 +- code/game/objects/items/toys.dm | 4 ++-- code/game/objects/items/weapons/defib.dm | 4 ++-- code/game/objects/items/weapons/dice.dm | 2 +- .../items/weapons/grenades/clowngrenade.dm | 2 +- .../items/weapons/grenades/flashbang.dm | 10 +++++----- .../game/objects/items/weapons/hydroponics.dm | 2 +- .../objects/items/weapons/implants/implant.dm | 2 +- code/game/objects/items/weapons/kitchen.dm | 8 ++++---- code/game/objects/items/weapons/lance.dm | 2 +- code/game/objects/items/weapons/shard.dm | 2 +- .../items/weapons/storage/bluespace.dm | 4 ++-- code/game/objects/items/weapons/stunbaton.dm | 8 ++++---- .../items/weapons/surgery_limbattachment.dm | 2 +- .../objects/items/weapons/surgery_tools.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 12 +++++------ .../structures/crates_lockers/closets.dm | 2 +- code/game/objects/structures/mirror.dm | 2 +- .../structures/stool_bed_chair_nest/chairs.dm | 4 ++-- .../structures/stool_bed_chair_nest/stools.dm | 2 +- code/game/objects/structures/tables_racks.dm | 8 ++++---- .../objects/structures/vehicles/adminbus.dm | 2 +- .../objects/structures/vehicles/clowncart.dm | 4 ++-- .../objects/structures/vehicles/secway.dm | 6 +++--- .../objects/structures/vehicles/wheelchair.dm | 4 ++-- code/game/objects/structures/watercloset.dm | 2 +- code/game/objects/structures/window.dm | 2 +- code/game/turfs/simulated.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 2 +- code/modules/flufftext/Hallucination.dm | 2 +- code/modules/genetics/side_effects.dm | 4 ++-- code/modules/hydroponics/grown_inedible.dm | 2 +- code/modules/mining/mine_items.dm | 6 +++--- code/modules/mob/living/carbon/alien/alien.dm | 6 +++--- .../living/carbon/alien/humanoid/humanoid.dm | 14 ++++++------- .../mob/living/carbon/alien/humanoid/life.dm | 4 ++-- .../mob/living/carbon/alien/larva/larva.dm | 8 ++++---- .../mob/living/carbon/alien/larva/life.dm | 4 ++-- code/modules/mob/living/carbon/brain/life.dm | 4 ++-- code/modules/mob/living/carbon/carbon.dm | 12 +++++------ code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../living/carbon/human/human_attackalien.dm | 4 ++-- .../living/carbon/human/human_attackhand.dm | 4 ++-- .../mob/living/carbon/human/human_damage.dm | 2 +- .../carbon/human/life/handle_disabilities.dm | 2 +- .../life/handle_mutations_and_radiation.dm | 4 ++-- .../life/handle_regular_status_updates.dm | 4 ++-- .../living/carbon/human/life/handle_shock.dm | 8 ++++---- .../carbon/human/life/handle_stomach.dm | 10 +++++----- code/modules/mob/living/carbon/monkey/life.dm | 10 +++++----- .../mob/living/carbon/monkey/monkey.dm | 6 +++--- code/modules/mob/living/carbon/slime/life.dm | 4 ++-- code/modules/mob/living/carbon/slime/slime.dm | 2 +- code/modules/mob/living/damage_procs.dm | 2 +- code/modules/mob/living/living.dm | 4 ++-- code/modules/mob/living/living_defense.dm | 2 +- code/modules/mob/living/silicon/mommi/life.dm | 12 +++++------ .../modules/mob/living/silicon/mommi/mommi.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 12 +++++------ .../modules/mob/living/silicon/robot/robot.dm | 2 +- code/modules/mob/living/silicon/silicon.dm | 2 +- .../simple_animal/friendly/farm_animals.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 2 +- .../living/simple_animal/hostile/faithless.dm | 2 +- .../mob/living/simple_animal/hostile/frog.dm | 2 +- .../mob/living/simple_animal/hostile/mimic.dm | 4 ++-- .../simple_animal/hostile/mining_mobs.dm | 2 +- .../simple_animal/hostile/retaliate/cluwne.dm | 4 ++-- .../mob/living/simple_animal/hostile/tree.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 4 ++-- code/modules/mob/mob.dm | 20 +++++++++---------- code/modules/mob/mob_defines.dm | 4 ++-- code/modules/mob/mob_grab.dm | 2 +- code/modules/mob/mob_helpers.dm | 2 +- .../projectiles/guns/energy/gravitywell.dm | 2 +- .../guns/projectile/constructable/blinder.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 6 +++--- .../modules/projectiles/projectile/bullets.dm | 2 +- .../projectiles/projectile/gravitywell.dm | 2 +- .../modules/projectiles/projectile/special.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 10 +++++----- code/modules/reagents/Chemistry-Recipes.dm | 2 +- .../reagent_containers/food/snacks.dm | 2 +- .../reagent_containers/food/snacks/grown.dm | 4 ++-- code/modules/research/research_shuttle.dm | 2 +- .../xenoarchaeology/artifact/effect_old.dm | 20 +++++++++---------- .../artifact/effects/unknown_effect_hurt.dm | 2 +- .../artifact/effects/unknown_effect_stun.dm | 12 +++++------ .../tools/suspension_generator.dm | 14 ++++++------- code/modules/spells/spell_code.dm | 4 ++-- .../spells/targeted/buttbots_revenge.dm | 10 +++++----- .../targeted/projectile/magic_missile.dm | 2 +- code/modules/spells/targeted/targeted.dm | 6 +++--- code/modules/telesci/telesci_computer.dm | 2 +- .../goonheist/genetics2/BioEffectsVerbs.dm | 10 +++++----- code/unused/goonheist/genetics2/bioEffects.dm | 2 +- code/unused/hivebot/hivebot.dm | 4 ++-- code/unused/hivebot/life.dm | 6 +++--- maps/RandomZLevels/wildwest.dm | 2 +- maps/randomvaults/dance_revolution.dm | 2 +- 140 files changed, 314 insertions(+), 314 deletions(-) diff --git a/__DEFINES/setup.dm b/__DEFINES/setup.dm index 537f54af612..b17752ffa14 100644 --- a/__DEFINES/setup.dm +++ b/__DEFINES/setup.dm @@ -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 diff --git a/code/TriDimension/Turfs.dm b/code/TriDimension/Turfs.dm index 61fa1970fc4..a1524dd6bc5 100644 --- a/code/TriDimension/Turfs.dm +++ b/code/TriDimension/Turfs.dm @@ -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() diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index c9f27ed3770..64d1f508bf5 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -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, "You stay upright as the air rushes past you.") return 0 - if(weakened <= 0) + if(knockdown <= 0) to_chat(src, "The sudden rush of air knocks you over!") - 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, "You stay upright as the air rushes past you.") return 0 - if(weakened <= 0) + if(knockdown <= 0) to_chat(src, "The sudden rush of air knocks you over!") - 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) diff --git a/code/_onclick/oldcode.dm b/code/_onclick/oldcode.dm index 2f67b34ac55..96f1c231709 100644 --- a/code/_onclick/oldcode.dm +++ b/code/_onclick/oldcode.dm @@ -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 diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 4f657da3733..ccf2e535285 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -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 diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 04bbad0d877..708a0fdbd6c 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -41,13 +41,13 @@ H.vomit() else to_chat(affected_mob, "You gag as you want to throw up, but there's nothing in your stomach!") - 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, "Your abdomen is a world of pain!") - H.Weaken(10) + H.Knockdown(10) H.op_stage.appendix = 2.0 var/datum/organ/external/groin = H.get_organ(LIMB_GROIN) diff --git a/code/datums/shuttle.dm b/code/datums/shuttle.dm index 4903f5a959c..31162ad0b24 100644 --- a/code/datums/shuttle.dm +++ b/code/datums/shuttle.dm @@ -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 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index d4435e98333..329843dd98c 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -241,7 +241,7 @@ step(H, H.dir) H.visible_message("[H] was tripped by the bolas!","Your legs have been tangled!"); 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() diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 4634df2ab2c..13fbb583369 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -460,7 +460,7 @@ target.visible_message("[target.name] takes a huge leap!") playsound(target.loc, 'sound/weapons/thudswoosh.ogg', 50, 1) if(failed_leap) - target.Weaken(5) + target.Knockdown(5) target.Stun(5) target.visible_message(" \the [usr] attempts to leap away but is slammed back down to the ground!", "You attempt to leap away but are suddenly slammed back down to the ground!", @@ -482,16 +482,16 @@ if (M_FAT in target.mutations && prob(66)) target.visible_message("[target.name] crashes due to their heavy weight!") //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, "You leap and slam your head against the inside of [container]! Ouch!") - target.paralysis += 3 - target.weakened += 5 + target.AdjustParalysis(3) + target.AdjustKnockdown(5) container.visible_message("[container] emits a loud thump and rattles a bit.") playsound(target.loc, 'sound/effects/bang.ogg', 50, 1) var/wiggle = 6 diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index 7bd013bc65a..bdedeeac941 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -294,7 +294,7 @@ M.update_mutations() //update our mutation overlays M.update_body() to_chat(M, "You suddenly feel very weak.") - M.Weaken(3) + M.Knockdown(3) M.emote("collapse") */ /datum/dna/gene/basic/xray diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index 213206d76a7..02b3c49a836 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -54,7 +54,7 @@ Obviously, requires DNA2. M.update_mutations() //update our mutation overlays M.update_body() to_chat(M, "You suddenly feel very weak.") - M.Weaken(3) + M.Knockdown(3) M.emote("collapse") /spell/targeted/genetic/hulk diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index f15631bd168..17ab0f11fc3 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -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, "Your muscles begin to painfully tighten.") - target.Weaken(20) + target.Knockdown(20) feedback_add_details("changeling_powers", "PS") return 1 diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 77306c47a0d..8d99cb69c3d 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -210,7 +210,7 @@ M.Sleeping(300)//putting them to sleep for 5 minutes. to_chat(usr, "The ritual didn't work! Looks like this person just isn't suited to be part of our cult.") to_chat(usr, "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.") - else if(M.weakened) + else if(M.knockdown) to_chat(usr, "The ritual didn't work, either something is disrupting it, or this person just isn't suited to be part of our cult.") to_chat(usr, "You have to restrain him before the talisman's effects wear off!") to_chat(M, "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.") @@ -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("The rune explodes in a bright flash.") else if(issilicon(L)) var/mob/living/silicon/S = L - S.Weaken(5) + S.Knockdown(5) S.visible_message("BZZZT... The rune has exploded in a bright flash.") qdel(src) return diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 471b93ec320..d7d55a4d791 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -188,14 +188,14 @@ usr.visible_message("[usr] invokes a talisman at [T]") 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 diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm index b181515dc82..56bc959b3d8 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm @@ -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) diff --git a/code/game/gamemodes/endgame/xmas/krampus.dm b/code/game/gamemodes/endgame/xmas/krampus.dm index e4ba22e189b..6e5598680a7 100644 --- a/code/game/gamemodes/endgame/xmas/krampus.dm +++ b/code/game/gamemodes/endgame/xmas/krampus.dm @@ -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) diff --git a/code/game/gamemodes/endgame/xmas/snow.dm b/code/game/gamemodes/endgame/xmas/snow.dm index 5bb19a2eb35..40ac10f9456 100644 --- a/code/game/gamemodes/endgame/xmas/snow.dm +++ b/code/game/gamemodes/endgame/xmas/snow.dm @@ -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) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index b999e5fcf1c..292048f1d93 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -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) diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index c0852d1d3c7..77841baeb4b 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -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, "You flush your system with clean blood and remove any incapacitating effects.") @@ -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, "You hear a ear piercing shriek and your senses dull!") - C.Weaken(8) + C.Knockdown(8) C.ear_deaf = 20 C.stuttering = 20 C.Stun(8) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 6fe4dcee1af..52a5835850c 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -486,7 +486,7 @@ /obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob) ..() to_chat(user, "You're knocked down!") - 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, "The book sets you alight!") - + /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, "Your reflection becomes warped and distorted!") diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 672fa11ab79..3e9205ce973 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -478,10 +478,10 @@ M.adjustOxyLoss(-12) M.updatehealth() M.AdjustParalysis(-4) - M.AdjustWeakened(-4) + M.AdjustKnockdown(-4) M.AdjustStunned(-4) M.Paralyse(1) - M.Weaken(1) + M.Knockdown(1) M.Stun(1) if (M:reagents.get_reagent_amount(INAPROVALINE) < 5) M:reagents.add_reagent(INAPROVALINE, 5) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index d08d41313ab..70c5a350993 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -344,9 +344,9 @@ Auto Patrol: []"}, if (M.stuttering < 10 && (!(M_HULK in M.mutations)) /*&& (!istype(M:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 10 M.Stun(10) - M.Weaken(10) + M.Knockdown(10) else - M.Weaken(10) + M.Knockdown(10) M.stuttering = 10 M.Stun(10) maxstuns-- @@ -381,7 +381,7 @@ Auto Patrol: []"}, src.anchored = 0 return // see if he got away - if ((!Adjacent(target)) || ((src.target:loc != src.target_lastloc) && src.target:weakened < 2)) + if ((!Adjacent(target)) || ((src.target:loc != src.target_lastloc) && src.target:knockdown < 2)) src.anchored = 0 mode = SECBOT_HUNT return diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index dbd3fadec7a..09bd4c02ab4 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -739,7 +739,7 @@ var/global/mulebot_count = 0 src.visible_message("[src] knocks over [M]!") M.stop_pulling() M.Stun(8) - M.Weaken(5) + M.Knockdown(5) M.lying = 1 ..() diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index b47383a40de..762aeaaa856 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -281,9 +281,9 @@ Auto Patrol: []"}, if(M.stuttering < 10 && (!(M_HULK in M.mutations))) M.stuttering = 10 M.Stun(10) - M.Weaken(10) + M.Knockdown(10) else - M.Weaken(10) + M.Knockdown(10) M.stuttering = 10 M.Stun(10) if(declare_arrests) @@ -334,7 +334,7 @@ Auto Patrol: []"}, if(SECBOT_PREP_ARREST) // preparing to arrest target // see if he got away - if((get_dist(src, src.target) > 1) || ((src.target:loc != src.target_lastloc) && src.target:weakened < 2)) + if((get_dist(src, src.target) > 1) || ((src.target:loc != src.target_lastloc) && src.target:knockdown < 2)) src.anchored = 0 mode = SECBOT_HUNT return diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 8659df3bfed..2d11f5d51bf 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -388,7 +388,7 @@ to_chat(user, "You need a better grip to do that!") return G.affecting.forceMove(src.loc) - G.affecting.Weaken(5) + G.affecting.Knockdown(5) visible_message("[G.assailant] puts [G.affecting] on the table.") qdel(W) return @@ -523,7 +523,7 @@ return G.affecting.forceMove(src.loc) - G.affecting.Weaken(5) + G.affecting.Knockdown(5) visible_message("[G.assailant] dunks [G.affecting] into the [src]!") qdel(W) return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 7e21c225827..13e80f969e0 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1248,7 +1248,7 @@ About the new airlock wires panel: continue L.SetStunned(5) - L.SetWeakened(5) + L.SetKnockdown(5) var/obj/effect/stop/S = new() S.forceMove(loc) S.victim = L diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index b8b17b8b2a0..ee1b704db54 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -129,7 +129,7 @@ var/list/all_doors = list() if (!istype(H.head, /obj/item/clothing/head/helmet)) visible_message("[user] headbutts the airlock.") H.Stun(8) - H.Weaken(5) + H.Knockdown(5) var/datum/organ/external/O = H.get_organ(LIMB_HEAD) // TODO: analyze the called proc diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 7d73c139b1c..c6f46e162ac 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -10,7 +10,7 @@ var/list/obj/machinery/flasher/flashers = list() var/range = 2 //this is roughly the size of brig cell var/disable = 0 var/last_flash = 0 //Don't want it getting spammed like regular flashes - var/strength = 10 //How weakened targets are when flashed. + var/strength = 10 //How knocked down targets are when flashed. var/base_state = "mflash" anchored = 1 ghost_read=0 @@ -98,9 +98,9 @@ var/list/obj/machinery/flasher/flashers = list() if(istype(O, /mob/living/carbon)) var/mob/living/carbon/C = O if(C.eyecheck() <= 0) // Identical to handheld flash safety check - C.Weaken(strength) + C.Knockdown(strength) else - O.Weaken(strength) + O.Knockdown(strength) /obj/machinery/flasher/emp_act(severity) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 482ece3f9ae..1f3153ae540 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -81,7 +81,7 @@ R.cell.charge = robot_cell_charge // So he can't jump out the gate right away. - R.weakened = 5 + R.SetKnockdown(5) // /vg/: Force borg module, if needed. R.pick_module(force_borg_module) @@ -90,7 +90,7 @@ spawn(50) playsound(get_turf(src), 'sound/machines/ding.ogg', 50, 0) if(R) - R.weakened = 0 + R.SetKnockdown(0) // Activate the cooldown cooldown_time = world.time + cooldown_duration diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index f627ad7d635..c1fa0da7ecf 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -227,10 +227,10 @@ M.adjustOxyLoss(-1) M.updatehealth() M.AdjustStunned(-4) - M.AdjustWeakened(-4) + M.AdjustKnockdown(-4) M.AdjustStunned(-4) M.Paralyse(2) - M.Weaken(2) + M.Knockdown(2) M.Stun(2) if(M.reagents.get_reagent_amount(INAPROVALINE) < 5) M.reagents.add_reagent(INAPROVALINE, 5) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 2faf0ece6ea..f808dc666cd 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -134,7 +134,7 @@ M.sleeping = 0 M.stuttering += 20 M.ear_deaf += 30 - M.Weaken(3) + M.Knockdown(3) if(prob(30)) M.Stun(10) M.Paralyse(4) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index aa9f0e3f919..a0bec6fef6d 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -400,7 +400,7 @@ if(C.locked_to) C.locked_to = 0 C.Stun(5) - C.Weaken(5) + C.Knockdown(5) C.apply_effect(STUTTER, 5) playsound(src, pick(hit_sound), 50, 0, 0) breakthrough = 1 @@ -1287,7 +1287,7 @@ loc.assume_air(removed) occupant.SetStunned(5) - occupant.SetWeakened(5) + occupant.SetKnockdown(5) to_chat(occupant, "You were blown out of the mech!") */ src.log_message("[mob_container] moved out.") @@ -1329,7 +1329,7 @@ spark_system.start() if (occupant) to_chat(occupant, "You feel a sharp shock!") - occupant.Weaken(10) + occupant.Knockdown(10) spawn(10) emergency_eject() diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 95439268e5d..914efe4d8da 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1052,7 +1052,7 @@ steam.start() -- spawns the effect for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) to_chat(M, "The explosion knocks you down.") - M.Weaken(rand(1,5)) + M.Knockdown(rand(1,5)) return else var/devastation = -1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 04b8abe75f8..75baadf2be0 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -902,7 +902,7 @@ /* to_chat(M, "You stab yourself in the eye.") M.sdisabilities |= BLIND - M.weakened += 4 + M.AdjustKnockdown(4) M.adjustBruteLoss(10) */ @@ -932,7 +932,7 @@ M.drop_item() M.eye_blurry += 10 M.Paralyse(1) - M.Weaken(4) + M.Knockdown(4) if (eyes.damage >= eyes.min_broken_damage) if(M.stat != 2) to_chat(M, "You go blind!") diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 2417b2d6564..fddd0f80469 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -85,7 +85,7 @@ var/safe = Subject.eyecheck() if(safe <= 0) - Subject.Weaken(10) + Subject.Knockdown(10) Subject.flash_eyes(visual = 1, affect_silicon = 1) if(user.mind && isrevhead(user)) // alien revhead when? @@ -117,7 +117,7 @@ else flashfail = TRUE else if(issilicon(M)) - M.Weaken(rand(5, 10)) + M.Knockdown(rand(5, 10)) else flashfail = TRUE @@ -217,7 +217,7 @@ var/mob/living/carbon/M = loc var/safety = M.eyecheck() if(safety <= 0) - M.Weaken(10) + M.Knockdown(10) M.flash_eyes(visual = 1) for(var/mob/O in viewers(M, null)) O.show_message("[M] is blinded by the flash!") diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 88c7f53fb68..a673169ed24 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -139,7 +139,7 @@ s.set_up(3, 1, M) s.start() - M.Weaken(10) + M.Knockdown(10) if(master && isWireCut(1)) master.receive_signal() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 6063895f163..bcac97502b1 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -44,7 +44,7 @@ effective or pretty fucking useless. spawn() if(prob(50)) - M.Weaken(rand(10,20)) + M.Knockdown(rand(10,20)) if(prob(25)) M.Stun(rand(5,10)) to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.") diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 37f0c2dab7e..c409a444fe6 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -22,7 +22,7 @@ user.cell.charge -= 30 - M.Weaken(5) + M.Knockdown(5) if (M.stuttering < 5) M.stuttering = 5 M.Stun(5) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 02975956e26..d0a80149e45 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -287,7 +287,7 @@ return else if (bullets == 0) - user.Weaken(5) + user.Knockdown(5) for(var/mob/O in viewers(world.view, user)) O.show_message(text("[] realizes they are out of ammo and starts scrounging for some!", user), 1) @@ -311,7 +311,7 @@ for(var/mob/O in viewers(M, null)) if (O.client) O.show_message(text("[] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!", user, M), 1, "You hear someone fall", 2) - user.Weaken(5) + user.Knockdown(5) return /obj/item/toy/ammo/crossbow diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 05e4c952d5b..57a6729e225 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -51,7 +51,7 @@ to_chat(user, "You touch the paddles together, shorting the device.") sparks.start() playsound(get_turf(src),'sound/items/defib.ogg',50,1) - user.Weaken(5) + user.Knockdown(5) var/mob/living/carbon/human/H = user if(ishuman(user)) H.apply_damage(20, BURN) @@ -108,7 +108,7 @@ /obj/item/weapon/melee/defibrillator/proc/shockAttack(mob/living/carbon/human/target,mob/user) var/datum/organ/internal/heart/heart = target.internal_organs_by_name["heart"] target.visible_message("[target] has been shocked in the chest with the [src] by [user]!") - target.Weaken(rand(6,12)) + target.Knockdown(rand(6,12)) target.apply_damage(rand(30,60),BURN,LIMB_CHEST) heart.damage += rand(5,60) target.emote("scream",,, 1) //If we're going this route, it kinda hurts diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index baaf1b9f605..2ec4caf3537 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -89,7 +89,7 @@ if(istype(H) && !H.shoes) to_chat(H, "You step on the D4!") H.apply_damage(4,BRUTE,(pick(LIMB_LEFT_LEG, LIMB_RIGHT_LEG))) - H.Weaken(3) + H.Knockdown(3) /obj/item/weapon/dice/update_icon() overlays.len = 0 diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm index 42e71426e27..b316b71beef 100644 --- a/code/game/objects/items/weapons/grenades/clowngrenade.dm +++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm @@ -93,7 +93,7 @@ M.simple_message("You slipped on \the [name]!",\ "Please, just end the pain!") playsound(get_turf(src), 'sound/misc/slip.ogg', 50, 1, -3) - M.Weaken(10) + M.Knockdown(10) M.take_overall_damage(0, burned) /obj/item/weapon/bananapeel/traitorpeel/throw_impact(atom/hit_atom) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 9cfb8758a5a..8b273b5e735 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -45,7 +45,7 @@ if(eye_safety < 1) M.flash_eyes(visual = 1, affect_silicon = 1) M.Stun(10) - M.Weaken(10) + M.Knockdown(10) //Now applying sound if(!ear_safety) @@ -58,10 +58,10 @@ if((get_dist(M, T) <= 2 || src.loc == M.loc || src.loc == M)) if(ear_safety > 0) M.Stun(2) - M.Weaken(2) + M.Knockdown(2) else M.Stun(10) - M.Weaken(10) + M.Knockdown(10) if ((prob(14) || (M == src.loc && prob(70)))) M.ear_damage += rand(1, 10) else @@ -71,13 +71,13 @@ else if(get_dist(M, T) <= 5) if(!ear_safety) M.Stun(8) - M.Weaken(8) + M.Knockdown(8) M.ear_damage += rand(0, 3) M.ear_deaf = max(M.ear_deaf,10) else if(!ear_safety) M.Stun(4) - M.Weaken(4) + M.Knockdown(4) M.ear_damage += rand(0, 1) M.ear_deaf = max(M.ear_deaf,5) diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 89179b03352..a1c552fe848 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -213,7 +213,7 @@ M.eye_blurry += force/7 if(prob(20)) M.Paralyse(force/6) - M.Weaken(force/15) + M.Knockdown(force/15) M.drop_item() diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 7910a7d2c67..bc71768ce22 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -380,7 +380,7 @@ the implant may become unstable and either pre-maturely inject the subject or si src.uses-- to_chat(source, "You feel a sudden surge of energy!") source.SetStunned(0) - source.SetWeakened(0) + source.SetKnockdown(0) source.SetParalysis(0) return diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 86ae181475e..3a1a7e5d0a4 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -268,7 +268,7 @@ if(istype(hit_atom, /mob/living) && prob(85)) var/mob/living/L = hit_atom L.Stun(5) - L.Weaken(5) + L.Knockdown(5) return ..() /* @@ -363,7 +363,7 @@ if((M_CLUMSY in user.mutations) && prob(50)) //What if he's a clown? to_chat(M, "You accidentally slam yourself with the [src]!") - M.Weaken(1) + M.Knockdown(1) user.take_organ_damage(2) if(prob(50)) playsound(M, 'sound/items/trayhit1.ogg', 50, 1) @@ -392,7 +392,7 @@ M.LAssailant = user if(prob(15)) - M.Weaken(3) + M.Knockdown(3) M.take_organ_damage(3) else M.take_organ_damage(5) @@ -463,7 +463,7 @@ else M.take_organ_damage(8) if(prob(30)) - M.Weaken(2) + M.Knockdown(2) return return /* diff --git a/code/game/objects/items/weapons/lance.dm b/code/game/objects/items/weapons/lance.dm index b5796c6d995..4ef4d086f0b 100644 --- a/code/game/objects/items/weapons/lance.dm +++ b/code/game/objects/items/weapons/lance.dm @@ -178,7 +178,7 @@ if(amount_of_turfs_charged >= 5) - victim.Weaken(min(amount_of_turfs_charged-5, 5))//Stun begins at 5 charged turfs. Maximum effect at 10 charged turfs + victim.Knockdown(min(amount_of_turfs_charged-5, 5))//Stun begins at 5 charged turfs. Maximum effect at 10 charged turfs if(amount_of_turfs_charged >= 10) victim.throw_at(get_edge_target_turf(get_turf(victim), last_move), amount_of_turfs_charged * 0.25, 0.1) diff --git a/code/game/objects/items/weapons/shard.dm b/code/game/objects/items/weapons/shard.dm index bb8fb59b4ed..0bd84330e2a 100644 --- a/code/game/objects/items/weapons/shard.dm +++ b/code/game/objects/items/weapons/shard.dm @@ -118,7 +118,7 @@ return if(!(H.species && (H.species.flags & NO_PAIN))) - H.Weaken(3) + H.Knockdown(3) if(affecting.take_damage(5, 0)) H.UpdateDamageIcon() H.updatehealth() diff --git a/code/game/objects/items/weapons/storage/bluespace.dm b/code/game/objects/items/weapons/storage/bluespace.dm index 83971371dd4..93dfab0ea28 100644 --- a/code/game/objects/items/weapons/storage/bluespace.dm +++ b/code/game/objects/items/weapons/storage/bluespace.dm @@ -43,7 +43,7 @@ //BoH+BoH=Singularity, WAS commented out /obj/item/weapon/storage/backpack/holding/proc/singulocreate(var/obj/item/weapon/storage/backpack/holding/H, var/mob/user) - user.Weaken(10) + user.Knockdown(10) investigation_log(I_SINGULO,"has become a singularity. Caused by [user.key]") message_admins("[key_name_admin(user)] detonated [H] and [src], creating a singularity.") log_game("[key_name(user)] detonated [H] and [src], creating a singularity.") @@ -51,7 +51,7 @@ to_chat(user, "FUCK!") qdel(H) new /obj/machinery/singularity (get_turf(src)) - user.throw_at(get_turf(src), 10, 5) //if they moved away from the turf before getting weakened, they end up back in the singulo's grasp anyway. + user.throw_at(get_turf(src), 10, 5) //if they moved away from the turf before getting knockdown, they end up back in the singulo's grasp anyway. qdel(src) /obj/item/weapon/storage/backpack/holding/singularity_act(var/current_size,var/obj/machinery/singularity/S) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index ba296f05396..2a6894041d9 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -98,7 +98,7 @@ if(status && (M_CLUMSY in user.mutations) && prob(50)) user.simple_message("You grab the [src] on the wrong side.", "The [name] blasts you with its power!") - user.Weaken(stunforce*3) + user.Knockdown(stunforce*3) playsound(loc, "sparks", 75, 1, -1) deductcharge(hitcost) return @@ -123,7 +123,7 @@ if(status && (M_CLUMSY in user.mutations) && prob(50)) user.simple_message("You accidentally hit yourself with [src]!", "The [name] goes mad!") - user.Weaken(stunforce*3) + user.Knockdown(stunforce*3) deductcharge(hitcost) return @@ -160,7 +160,7 @@ L.lastattacker = user L.Stun(stunforce) - L.Weaken(stunforce) + L.Knockdown(stunforce) L.apply_effect(STUTTER, stunforce) L.visible_message("[L] has been stunned with [src] by [user]!",\ @@ -193,7 +193,7 @@ L.lastattacker = foundmob L.Stun(stunforce) - L.Weaken(stunforce) + L.Knockdown(stunforce) L.apply_effect(STUTTER, stunforce) L.visible_message("[L] has been stunned with [src] by [foundmob ? foundmob : "Unknown"]!") diff --git a/code/game/objects/items/weapons/surgery_limbattachment.dm b/code/game/objects/items/weapons/surgery_limbattachment.dm index f7d2aa504ba..77dbe3ec2a4 100644 --- a/code/game/objects/items/weapons/surgery_limbattachment.dm +++ b/code/game/objects/items/weapons/surgery_limbattachment.dm @@ -4,7 +4,7 @@ if(!istype(M)) return ..() - if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/bed/roller, M.loc) && (M.incapacitated()) && prob(75) || (locate(/obj/structure/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(66)))) + if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/bed/roller, M.loc) && (M.incapacitated()) && prob(75) || (locate(/obj/structure/table/, M.loc) && (M.lying || M.knockdown || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(66)))) return ..() if(!istype(M, /mob/living/carbon/human)) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 94695cf4c75..fc594b02a24 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -946,7 +946,7 @@ LOOK FOR SURGERY.DM*/ target.resting = 0 target.AdjustParalysis(-3) target.AdjustStunned(-3) - target.AdjustWeakened(-3) + target.AdjustKnockdown(-3) playsound(get_turf(target), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) target.visible_message( "[user] prods [target] trying to wake \him up!", diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index e71e42fefda..0a20edf5c66 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -35,7 +35,7 @@ /obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob) if ((M_CLUMSY in user.mutations) && prob(50)) to_chat(user, "You club yourself over the head.") - user.Weaken(3 * force) + user.Knockdown(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(2*force, BRUTE, LIMB_HEAD) @@ -56,14 +56,14 @@ if (M.stuttering < 8 && (!(M_HULK in M.mutations)) /*&& (!istype(H:wear_suit, /obj/item/clothing/suit/judgerobe))*/) M.stuttering = 8 M.Stun(8) - M.Weaken(8) + M.Knockdown(8) for(var/mob/O in viewers(M)) if (O.client) O.show_message("[M] has been beaten with \the [src] by [user]!", 1, "You hear someone fall", 2) else playsound(get_turf(src), 'sound/weapons/Genhit.ogg', 50, 1, -1) M.Stun(5) - M.Weaken(5) + M.Knockdown(5) M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") @@ -145,7 +145,7 @@ user.simple_message("You club yourself over the head.", "The fishing rod goes mad!") - user.Weaken(3 * force) + user.Knockdown(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(2*force, BRUTE, LIMB_HEAD) @@ -158,10 +158,10 @@ if(!isrobot(target)) playsound(get_turf(src), "swing_hit", 50, 1, -1) //target.Stun(4) //naaah - target.Weaken(4) + target.Knockdown(4) else playsound(get_turf(src), 'sound/weapons/Genhit.ogg', 50, 1, -1) - target.Weaken(2) + target.Knockdown(2) target.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [target.name] ([target.ckey])") log_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index c7e5a60fc30..d039e449eed 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -387,7 +387,7 @@ C.images += temp_overlay L << sound('sound/machines/click.ogg') L << sound('sound/hallucinations/scary.ogg') - L.Weaken(5) + L.Knockdown(5) sleep(50) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 459650de44b..ef3227fd0ee 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -23,7 +23,7 @@ switch(rand(1,100)) if(1 to 20) to_chat(H, "You look like [pick("a monster","a goliath","a catbeast","a ghost","a chicken","the mailman","a demon")]! Your heart skips a beat.") - H.Weaken(4) + H.Knockdown(4) return if(21 to 40) to_chat(H, "There's [pick("somebody","a monster","a little girl","a zombie","a ghost","a catbeast","a demon")] standing behind you!") diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index a8e692080b5..2a9f8217947 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -85,7 +85,7 @@ if(ishuman(M)) target = M if((target) && (target.op_stage.butt == 4)) //Butt surgery is at stage 4 - if(!M.weakened) //Spam prevention + if(!M.knockdown) //Spam prevention if(M == usr) M.visible_message(\ "[M.name] has no butt, and slides right out of [src]!",\ @@ -98,7 +98,7 @@ "Having no butt, you slide right out of the [src]",\ "You hear metal clanking.") - M.Weaken(5) + M.Knockdown(5) else to_chat(user, "You can't buckle [M.name] to [src], They just fell out!") diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 40526e8b8ad..e7108befc85 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -55,7 +55,7 @@ qdel(src) var/mob/living/T = M - T.Weaken(10) + T.Knockdown(10) T.apply_damage(20) return diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 163c74714eb..6ea502ecfc6 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -379,7 +379,7 @@ if(user.a_intent == I_HURT) G.affecting.forceMove(loc) if (prob(15)) - M.Weaken(5) + M.Knockdown(5) M.apply_damage(8,def_zone = LIMB_HEAD) visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!") playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 50, 1) @@ -388,7 +388,7 @@ return else G.affecting.forceMove(loc) - G.affecting.Weaken(5) + G.affecting.Knockdown(5) visible_message("[G.assailant] puts [G.affecting] on \the [src].") returnToPool(W) return @@ -629,7 +629,7 @@ if (G.state < GRAB_AGGRESSIVE) if(user.a_intent == I_HURT) if (prob(15)) - M.Weaken(5) + M.Knockdown(5) M.apply_damage(15,def_zone = LIMB_HEAD) visible_message("[G.assailant] slams [G.affecting]'s face against \the [src]!") playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 50, 1) @@ -642,7 +642,7 @@ return else G.affecting.forceMove(loc) - G.affecting.Weaken(5) + G.affecting.Knockdown(5) visible_message("[G.assailant] puts [G.affecting] on \the [src].") returnToPool(W) diff --git a/code/game/objects/structures/vehicles/adminbus.dm b/code/game/objects/structures/vehicles/adminbus.dm index 7000a95468b..7447041a11e 100644 --- a/code/game/objects/structures/vehicles/adminbus.dm +++ b/code/game/objects/structures/vehicles/adminbus.dm @@ -236,7 +236,7 @@ if(L.locked_to) L.locked_to = 0 L.Stun(5) - L.Weaken(5) + L.Knockdown(5) L.apply_effect(STUTTER, 5) playsound(src, pick(hit_sound), 50, 0, 0) if(3) diff --git a/code/game/objects/structures/vehicles/clowncart.dm b/code/game/objects/structures/vehicles/clowncart.dm index 9963d23e9db..05cb40e6e0d 100644 --- a/code/game/objects/structures/vehicles/clowncart.dm +++ b/code/game/objects/structures/vehicles/clowncart.dm @@ -92,7 +92,7 @@ if(activated) visible_message("[nick] lets out a last honk before running out of fuel and activating its ejection seat.") if(ishuman(user)) //This shouldn't be needed, but fucks sakes - user.Weaken(5) + user.Knockdown(5) playsound(get_turf(src), 'sound/items/bikehorn.ogg', 50, 1) activated = 0 reagents.remove_reagent(BANANA, 5) @@ -270,7 +270,7 @@ to_chat(user, "[src] has no fuel, it activates its ejection seat as soon as you jam down the pedal!") unlock_atom(user) activated = 0 - user.Weaken(5) //Only Weaken after unbuckling + user.Knockdown(5) //Only Weaken after unbuckling return if(activated) var/old_pos = get_turf(src) diff --git a/code/game/objects/structures/vehicles/secway.dm b/code/game/objects/structures/vehicles/secway.dm index 915e67c21b4..9405a613424 100644 --- a/code/game/objects/structures/vehicles/secway.dm +++ b/code/game/objects/structures/vehicles/secway.dm @@ -9,7 +9,7 @@ name = "secway key" desc = "A keyring with a small steel key, and a rubber stun baton accessory." icon_state = "keysec" - + /obj/structure/bed/chair/vehicle/secway/check_key(var/mob/user) return user.find_held_item_by_type(keytype) //any secway key works with any other secway @@ -54,13 +54,13 @@ var/mob/living/M = occupant if(!(M_CLUMSY in M.mutations) && M.dizziness < 450) return - occupant.Weaken(2) + occupant.Knockdown(2) occupant.Stun(2) playsound(get_turf(src), "sound/effects/meteorimpact.ogg", 25, 1) occupant.visible_message("[occupant] crashes into \the [obstacle]!", "You crash into \the [obstacle]!") if(istype(obstacle, /mob/living)) var/mob/living/idiot = obstacle - idiot.Weaken(2) + idiot.Knockdown(2) idiot.Stun(2) diff --git a/code/game/objects/structures/vehicles/wheelchair.dm b/code/game/objects/structures/vehicles/wheelchair.dm index 3bd81b92823..068ca7e9840 100644 --- a/code/game/objects/structures/vehicles/wheelchair.dm +++ b/code/game/objects/structures/vehicles/wheelchair.dm @@ -258,13 +258,13 @@ if(isrobot(L)) src.visible_message("[src] slams into [L]!") L.Stun(2) - L.Weaken(2) + L.Knockdown(2) L.adjustBruteLoss(rand(4,6)) else src.visible_message("[src] knocks over [L]!") L.stop_pulling() L.Stun(8) - L.Weaken(5) + L.Knockdown(5) L.lying = 1 L.update_icons() ..() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index c93c16c8b0c..73120bebdb8 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -525,7 +525,7 @@ flick("baton_active", src) user.Stun(10) user.stuttering = 10 - user.Weaken(10) + user.Knockdown(10) if(isrobot(user)) var/mob/living/silicon/robot/R = user R.cell.charge -= 20 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index d7914889c7f..1d2eb204371 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -260,7 +260,7 @@ visible_message("\The [user] slams \the [M] into \the [src]!", \ "You slam \the [M] into \the [src]!") if(GRAB_NECK to GRAB_KILL) - M.Weaken(3) //Almost certainly shoved head or face-first, you're going to need a bit for the lights to come back on + M.Knockdown(3) //Almost certainly shoved head or face-first, you're going to need a bit for the lights to come back on M.apply_damage(20) //That got to fucking hurt, you were basically flung into a window, most likely a shattered one at that health -= 20 //Window won't like that visible_message("\The [user] crushes \the [M] into \the [src]!", \ diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 56f1e1cec9e..d75ecdcb989 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -101,7 +101,7 @@ M.visible_message("[M] slips on the floor!", \ "You slip on the floor!") playsound(get_turf(src), 'sound/misc/slip.ogg', 50, 1, -3) - M.Weaken(10) + M.Knockdown(10) if(3) // Ice if(prob(30) && M.Slip(4, 3)) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 4162da0996e..ef7bfde703d 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2173,7 +2173,7 @@ else M.adjustBruteLoss( min( 99 , (M.health - 1) ) ) M.Stun(20) - M.Weaken(20) + M.Knockdown(20) M.stuttering = 20 else if (href_list["PrayerReply"]) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 3fc64135964..f7ca361e17d 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -31,7 +31,7 @@ if("feet") if(!H.shoes) affecting = H.get_organ(pick(LIMB_LEFT_LEG, LIMB_RIGHT_LEG)) - H.Weaken(3) + H.Knockdown(3) if(LIMB_LEFT_HAND, LIMB_RIGHT_HAND) if(!H.gloves) affecting = H.get_organ(type) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index e22c96cdb09..1708864d24f 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -198,7 +198,7 @@ H.sleeping = 0 H.stuttering += 20 H.ear_deaf += 30 - H.Weaken(3) //Copied from honkerblast 5000 + H.Knockdown(3) //Copied from honkerblast 5000 if(prob(30)) H.Stun(10) H.Paralyse(4) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 9275a0a3604..03543685064 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -269,7 +269,7 @@ mob/living/carbon/proc/handle_hallucinations() flash_eyes(visual = 1) if(prob(20)) - src.Weaken(10) + src.Knockdown(10) if(82 to 85) //Clown src << get_sfx("clownstep") spawn(rand(16,28)) diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm index 63179c239e0..409f4a37147 100644 --- a/code/modules/genetics/side_effects.dm +++ b/code/modules/genetics/side_effects.dm @@ -87,10 +87,10 @@ proc/trigger_side_effect(mob/living/carbon/human/H) spawn(20) if(!istype(H)) return - H.Weaken(rand(0, S.duration / 50)) + H.Knockdown(rand(0, S.duration / 50)) sleep(S.duration) if(!istype(H)) return - H.SetWeakened(0) + H.SetKnockdown(0) S.finish(H) \ No newline at end of file diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index e33c014f041..cac80fd4f4b 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -229,7 +229,7 @@ M.eye_blurry += force/7 if(prob(20)) M.Paralyse(force/6) - M.Weaken(force/15) + M.Knockdown(force/15) M.drop_item() /obj/item/weapon/grown/deathnettle/afterattack(atom/A as mob|obj, mob/user as mob, proximity) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 448ffbab382..2af5af7f989 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -107,7 +107,7 @@ proc/move_mining_shuttle() shake_camera(M, 10, 1) // unlocked_to, HOLY SHIT SHAKE THE ROOM if(istype(M, /mob/living/carbon)) if(!M.locked_to) - M.Weaken(3) + M.Knockdown(3) mining_shuttle_moving = 0 return @@ -401,7 +401,7 @@ proc/move_mining_shuttle() if(isliving(M)) var/mob/living/L = M - L.Weaken(3) + L.Knockdown(3) if(ishuman(L)) shake_camera(L, 20, 1) spawn(20) @@ -521,7 +521,7 @@ proc/move_mining_shuttle() icon = 'icons/obj/aibots.dmi' icon_state = "mining_drone" icon_living = "mining_drone" - status_flags = CANSTUN|CANWEAKEN|CANPUSH + status_flags = CANSTUN|CANKNOCKDOWN|CANPUSH mouse_opacity = 1 faction = "neutral" a_intent = I_HURT diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index a75fefec198..4263bf11102 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -241,13 +241,13 @@ "You hear a policeman whistling!" ) - //if(src.stunned < shock_damage) src.stunned = shock_damage + //if(src.stunned < shock_damage) src.SetStunned(shock_damage) Stun(10) // this should work for now, more is really silly and makes you lay there forever - //if(src.weakened < 20*siemens_coeff) src.weakened = 20*siemens_coeff + //if(src.knockdown < 20*siemens_coeff) SetKnockdown(20*siemens_coeff) - Weaken(10) + Knockdown(10) var/datum/effect/effect/system/spark_spread/SparkSpread = new SparkSpread.set_up(5, 1, loc) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 9b6329fc99e..5d83402e426 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -175,7 +175,7 @@ M.powerlevel = 0 visible_message("\The [M] has shocked [src]!") - Weaken(power) + Knockdown(power) if(stuttering < power) stuttering = power Stun(power) @@ -203,7 +203,7 @@ if(G.cell.charge >= 2500) G.cell.charge -= 2500 - Weaken(5) + Knockdown(5) if(stuttering < 5) stuttering = 5 Stun(5) @@ -258,15 +258,15 @@ if(M_HULK in M.mutations) //M_HULK SMASH damage += 14 spawn(0) - Weaken(damage) //Why can a hulk knock an alien out but not knock out a human? Damage is robust enough. + Knockdown(damage) //Why can a hulk knock an alien out but not knock out a human? Damage is robust enough. step_away(src, M, 15) sleep(3) step_away(src, M, 15) playsound(loc, "punch", 25, 1, -1) visible_message("[M] has punched \the [src] !") if(damage > 9 ||prob(5))//Regular humans have a very small chance of weakening an alien. - Weaken(1, 5) - visible_message("[M] has weakened \the [src] !") + Knockdown(1, 5) + visible_message("[M] has knockdown \the [src] !") adjustBruteLoss(damage) updatehealth() else @@ -276,7 +276,7 @@ if(I_DISARM) if(!lying) if(prob(5)) //Very small chance to push an alien down. - Weaken(2) + Knockdown(2) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) visible_message("[M] has pushed down \the [src] !") else @@ -304,7 +304,7 @@ In all, this is a lot like the monkey code. /N resting = 0 AdjustParalysis(-3) AdjustStunned(-3) - AdjustWeakened(-3) + AdjustKnockdown(-3) visible_message("[M] nuzzles [src] trying to wake it up !") else if(health > 0) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 7f3ee018aa5..e7dcf031afa 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -367,8 +367,8 @@ if(!stunned) update_icons() - if(weakened) - weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times + if(knockdown) + knockdown = max(knockdown-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times if(stuttering) stuttering = max(stuttering-1, 0) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index fa9b115b1b7..212b0fe7826 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -178,7 +178,7 @@ if(G.cell.charge >= 2500) G.cell.use(2500) - Weaken(5) + Knockdown(5) if(stuttering < 5) stuttering = 5 Stun(5) @@ -221,8 +221,8 @@ playsound(loc, "punch", 25, 1, -1) visible_message("[M] has punched \the [src] !") if(damage > 4.9) - Weaken(rand(10,15)) - visible_message("[M] has weakened \the [src] !") + Knockdown(rand(10,15)) + visible_message("[M] has knocked down \the [src] !") adjustBruteLoss(damage) updatehealth() else @@ -249,7 +249,7 @@ resting = 0 AdjustParalysis(-3) AdjustStunned(-3) - AdjustWeakened(-3) + AdjustKnockdown(-3) visible_message("[M.name] nuzzles [src] trying to wake it up !") else diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index a5906f88d70..89a175923eb 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -288,8 +288,8 @@ if(stunned) AdjustStunned(-1) - if(weakened) - weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times + if(knockdown) + knockdown = max(knockdown-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times if(stuttering) stuttering = max(stuttering-1, 0) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 43110d973df..392336a07b7 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -197,8 +197,8 @@ if(stunned) AdjustStunned(-1) - if(weakened) - weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times + if(knockdown) + knockdown = max(knockdown-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times if(stuttering) stuttering = max(stuttering-1, 0) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index d6b91b41d73..a8e0179cf19 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -122,14 +122,14 @@ heal_overall_damage(damage/2, damage/2) Jitter(10) Stun(5) - Weaken(5) + Knockdown(5) //It would be cool if someone added an animation of some electrical shit going through the body else if(take_overall_damage(0, damage, used_weapon = "[source]") == 0) // godmode return 0 Jitter(20) Stun(10) - Weaken(10) + Knockdown(10) visible_message( \ "[src] was shocked by the [source]!", \ @@ -140,8 +140,8 @@ "You hear a policeman whistling!" ) - //if(src.stunned < shock_damage) src.stunned = shock_damage - //if(src.weakened < 20*siemens_coeff) src.weakened = 20*siemens_coeff + //if(src.stunned < shock_damage) src.SetStunned(shock_damage) + //if(src.knockdown < 20*siemens_coeff) src.SetKnockdown(20*siemens_coeff) var/datum/effect/effect/system/spark_spread/SparkSpread = new SparkSpread.set_up(5, 1, loc) @@ -227,7 +227,7 @@ src.resting = 0 AdjustParalysis(-3) AdjustStunned(-3) - AdjustWeakened(-3) + AdjustKnockdown(-3) playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) M.visible_message( \ "[M] shakes [src] trying to wake [t_him] up!", \ @@ -578,7 +578,7 @@ stop_pulling() Stun(stun_amount) - Weaken(weaken_amount) + Knockdown(weaken_amount) playsound(get_turf(src), 'sound/misc/slip.ogg', 50, 1, -3) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index ce36fd891e0..fc27ab20aa4 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -706,7 +706,7 @@ if (V == src) continue to_chat(V, "You're sent flying!") - V.Weaken(5) // why the hell was this set to 12 christ + V.Knockdown(5) // why the hell was this set to 12 christ step_away(V,location,15) step_away(V,location,15) step_away(V,location,15) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f2f0c2675fd..35a4cb7a6f4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -322,7 +322,7 @@ if ((O.client && !( O.blinded ))) O.show_message(text("The [M.name] has shocked []!", src), 1) - Weaken(power) + Knockdown(power) if (stuttering < power) stuttering = power Stun(power) diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm index dc3d694ee9c..d62085c9625 100644 --- a/code/modules/mob/living/carbon/human/human_attackalien.dm +++ b/code/modules/mob/living/carbon/human/human_attackalien.dm @@ -46,12 +46,12 @@ if(I_DISARM) if (prob(80)) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) - Weaken(rand(3,4)) + Knockdown(rand(3,4)) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[] has tackled down []!", M, src), 1) if (prob(25)) - M.Weaken(rand(4,5)) + M.Knockdown(rand(4,5)) else if (prob(80)) playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index dd0ce590f93..35a3d434647 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -64,7 +64,7 @@ if((src == M) || ((M_CLUMSY in M.mutations) && prob(20))) //Kicking yourself (or being clumsy) = stun M.visible_message("\The [M] trips while attempting to kick \the [src]!", "While attempting to kick \the [src], you trip and fall!") - M.Weaken(rand(1,10)) + M.Knockdown(rand(1,10)) return var/stomping = 0 @@ -312,7 +312,7 @@ visible_message("[M] [M.species.attack_verb] [src]!") if((knockout >= M.species.max_hurt_damage) && prob(50)) - visible_message("[M] has weakened [src]!") + visible_message("[M] has knocked down [src]!") apply_effect(2, WEAKEN, armor_block) if(M.species.punch_damage) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index d5bbae14280..f9eaa2f8c8f 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -109,7 +109,7 @@ return ..() -/mob/living/carbon/human/Weaken(amount) +/mob/living/carbon/human/Knockdown(amount) if(M_HULK in mutations) return ..() diff --git a/code/modules/mob/living/carbon/human/life/handle_disabilities.dm b/code/modules/mob/living/carbon/human/life/handle_disabilities.dm index 1266ae6fe90..9c30921a74d 100644 --- a/code/modules/mob/living/carbon/human/life/handle_disabilities.dm +++ b/code/modules/mob/living/carbon/human/life/handle_disabilities.dm @@ -97,4 +97,4 @@ if(10 <= rn && rn <= 12) if(canmove) to_chat(src, "Your legs won't respond properly, you fall down.") - Weaken(3) + Knockdown(3) diff --git a/code/modules/mob/living/carbon/human/life/handle_mutations_and_radiation.dm b/code/modules/mob/living/carbon/human/life/handle_mutations_and_radiation.dm index de4cbaba8be..6ed4e3e85b2 100644 --- a/code/modules/mob/living/carbon/human/life/handle_mutations_and_radiation.dm +++ b/code/modules/mob/living/carbon/human/life/handle_mutations_and_radiation.dm @@ -18,7 +18,7 @@ //Whoever wrote those next two blocks of code obviously never heard of mathematical helpers if(radiation > 100) radiation = 100 - Weaken(10) + Knockdown(10) to_chat(src, "You feel weak.") emote("collapse") @@ -51,7 +51,7 @@ adjustToxLoss(1) if(prob(5)) radiation -= 5 - Weaken(3) + Knockdown(3) to_chat(src, "You feel weak.") emote("collapse") updatehealth() diff --git a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm index bfa861f9909..f1746cc0427 100644 --- a/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm +++ b/code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm @@ -187,8 +187,8 @@ if(stunned) AdjustStunned(-1) - if(weakened) - weakened = max(weakened - 1,0) //Before you get mad Rockdtben: I done this so update_canmove isn't called multiple times + if(knockdown) + knockdown = max(knockdown - 1,0) //Before you get mad Rockdtben: I done this so update_canmove isn't called multiple times if(stuttering) stuttering = max(stuttering - 1, 0) diff --git a/code/modules/mob/living/carbon/human/life/handle_shock.dm b/code/modules/mob/living/carbon/human/life/handle_shock.dm index bc0d8c44522..d8297050274 100644 --- a/code/modules/mob/living/carbon/human/life/handle_shock.dm +++ b/code/modules/mob/living/carbon/human/life/handle_shock.dm @@ -38,12 +38,12 @@ visible_message("[src]'s body becomes limp.") if(prob(2)) to_chat(src, "[pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")]") - Weaken(20) + Knockdown(20) if(shock_stage >= 80) if(prob(5)) to_chat(src, "[pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")]") - Weaken(20) + Knockdown(20) if(shock_stage >= 120) if(prob(2)) @@ -53,7 +53,7 @@ if(shock_stage == 150) if(!isUnconscious()) visible_message("[src] can no longer stand, collapsing!") - Weaken(20) + Knockdown(20) if(shock_stage >= 150) - Weaken(20) + Knockdown(20) diff --git a/code/modules/mob/living/carbon/human/life/handle_stomach.dm b/code/modules/mob/living/carbon/human/life/handle_stomach.dm index 276505fc462..27f6a05e803 100644 --- a/code/modules/mob/living/carbon/human/life/handle_stomach.dm +++ b/code/modules/mob/living/carbon/human/life/handle_stomach.dm @@ -74,10 +74,10 @@ adjustOxyLoss(rand(1,10)) to_chat(src, "[pick(hunger_phrases)]") - else if(prob(5)) //5% chance of being weakened + else if(prob(5)) //5% chance of being knocked down eye_blurry += 10 - Weaken(10) + Knockdown(10) adjustOxyLoss(rand(1,15)) to_chat(src, "You're starving! The lack of strength makes you black out for a few moments...") @@ -90,8 +90,8 @@ adjustOxyLoss(rand(1,20)) to_chat(src, "You're starving. You feel your life force slowly leaving your body...") eye_blurry += 20 - if(weakened < 1) - Weaken(20) + if(knockdown < 1) + Knockdown(20) else if(paralysis<1 && prob(5)) //Mini seizure (25% duration and strength of a normal seizure) @@ -109,4 +109,4 @@ adjustBrainLoss(STARVATION_BRAIN_DAMAGE) if(prob(10)) - Weaken(15) + Knockdown(15) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 7a9cad73872..419ecf19736 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -133,7 +133,7 @@ if ((M_HULK in mutations) && health <= 25) mutations.Remove(M_HULK) to_chat(src, "You suddenly feel very weak.") - Weaken(3) + Knockdown(3) emote("collapse") if(reagents.has_reagent(CREATINE)) var/datum/reagent/creatine/C = reagents.get_reagent(CREATINE) @@ -153,7 +153,7 @@ if (radiation > 100) radiation = 100 - Weaken(10) + Knockdown(10) to_chat(src, "You feel weak.") emote("collapse") @@ -169,7 +169,7 @@ adjustToxLoss(1) if(prob(5)) radiation -= 5 - Weaken(3) + Knockdown(3) to_chat(src, "You feel weak.") emote("collapse") updatehealth() @@ -626,8 +626,8 @@ if(stunned) AdjustStunned(-1) - if(weakened) - weakened = max(weakened-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times + if(knockdown) + knockdown = max(knockdown-1,0) //before you get mad Rockdtben: I done this so update_canmove isn't called multiple times if(stuttering) stuttering = max(stuttering-1, 0) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index f2a565c5a57..822a0611c9f 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -281,7 +281,7 @@ if(M.a_intent == I_HURT)//Stungloves. Any contact will stun the alien. if(G.cell.charge >= 2500) G.cell.use(2500) - Weaken(5) + Knockdown(5) if (stuttering < 5) stuttering = 5 Stun(5) @@ -416,7 +416,7 @@ playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) var/damage = 5 if(prob(95)) - Weaken(15) + Knockdown(15) for(var/mob/O in viewers(src, null)) if ((O.client && !( O.blinded ))) O.show_message(text("[] has tackled down [name]!", M), 1) @@ -482,7 +482,7 @@ if ((O.client && !( O.blinded ))) O.show_message(text("The [M.name] has shocked []!", src), 1) - Weaken(power) + Knockdown(power) if (stuttering < power) stuttering = power Stun(power) diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm index 71f4cbe8458..8126c35d230 100644 --- a/code/modules/mob/living/carbon/slime/life.dm +++ b/code/modules/mob/living/carbon/slime/life.dm @@ -295,8 +295,8 @@ if (src.stunned > 0) AdjustStunned(-1) src.stat = 0 - if (src.weakened > 0) - AdjustWeakened(-1) + if (src.knockdown > 0) + AdjustKnockdown(-1) src.lying = 0 src.stat = 0 if (src.paralysis > 0) diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index bc0f0e7f760..3208aac5924 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -20,7 +20,7 @@ can_butcher = 0 - // canstun and canweaken don't affect slimes because they ignore stun and weakened variables + // canstun and CANKNOCKDOWN don't affect slimes because they ignore stun and knockdown variables // for the sake of cleanliness, though, here they are. status_flags = CANPARALYSE|CANPUSH diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index a80e189e078..5c492d4fdd9 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -62,7 +62,7 @@ Stun(altered) if(WEAKEN) altered = effect/(blocked+1) - Weaken(altered) + Knockdown(altered) if(PARALYZE) altered = effect/(blocked+1) Paralyse(altered) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a2096e6d155..d3113c4541d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -523,7 +523,7 @@ Thanks. halloss = 0 paralysis = 0 stunned = 0 - weakened = 0 + knockdown = 0 remove_jitter() germ_level = 0 next_pain_time = 0 @@ -997,7 +997,7 @@ Thanks. //putting out a fire if(CM.on_fire && CM.canmove) CM.fire_stacks -= 5 - CM.SetWeakened(3) + CM.SetKnockdown(3) playsound(CM.loc, 'sound/effects/bodyfall.ogg', 50, 1) CM.visible_message("[CM] rolls on the floor, trying to put themselves out!", "You stop, drop, and roll!") diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index b5734608ba5..49ca1496564 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -180,7 +180,7 @@ if((M_CLUMSY in M.mutations) && prob(20)) //Kicking yourself (or being clumsy) = stun M.visible_message("\The [M] trips while attempting to kick \the [src]!", "While attempting to kick \the [src], you trip and fall!") - M.Weaken(rand(1,10)) + M.Knockdown(rand(1,10)) return var/stomping = 0 diff --git a/code/modules/mob/living/silicon/mommi/life.dm b/code/modules/mob/living/silicon/mommi/life.dm index d2e28b111cd..36f49354a87 100644 --- a/code/modules/mob/living/silicon/mommi/life.dm +++ b/code/modules/mob/living/silicon/mommi/life.dm @@ -31,7 +31,7 @@ // SetStunned(min(stunned, 30)) SetParalysis(min(paralysis, 30)) -// SetWeakened(min(weakened, 20)) +// SetKnockdown(min(knockdown, 20)) sleeping = 0 adjustBruteLoss(0) adjustToxLoss(0) @@ -77,18 +77,18 @@ src.sleeping-- if(src.resting) - Weaken(5) + Knockdown(5) if(health <= 0 && src.stat != 2) //die only once gib() if (src.stat != 2) //Alive. - if (src.paralysis || src.stunned || src.weakened) //Stunned etc. + if (src.paralysis || src.stunned || src.knockdown) //Stunned etc. src.stat = 1 if (src.stunned > 0) AdjustStunned(-1) - if (src.weakened > 0) - AdjustWeakened(-1) + if (src.knockdown > 0) + AdjustKnockdown(-1) if (src.paralysis > 0) AdjustParalysis(-1) src.blinded = 1 @@ -260,7 +260,7 @@ src.head_state:screen_loc = ui_monkey_mask /mob/living/silicon/robot/mommi/update_canmove() - canmove = !(paralysis || stunned || weakened || locked_to || lockcharge || anchored) + canmove = !(paralysis || stunned || knockdown || locked_to || lockcharge || anchored) return canmove #undef MOMMI_LOW_POWER diff --git a/code/modules/mob/living/silicon/mommi/mommi.dm b/code/modules/mob/living/silicon/mommi/mommi.dm index 0f54568e9b0..b11e5cd1970 100644 --- a/code/modules/mob/living/silicon/mommi/mommi.dm +++ b/code/modules/mob/living/silicon/mommi/mommi.dm @@ -338,7 +338,7 @@ They can only use one tool at a time, they can't choose modules, and they have 1 var/randn = rand(1,100) //var/talked = 0; if (randn <= 25) - weakened = 3 + knockdown = 3 playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) visible_message("[user] has pushed [src]!") var/obj/item/found = locate(tool_state) in src.module.modules diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 5c6a2f45243..7a6adc58579 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -30,7 +30,7 @@ // SetStunned(min(stunned, 30)) SetParalysis(min(paralysis, 30)) -// SetWeakened(min(weakened, 20)) +// SetKnockdown(min(knockdown, 20)) sleeping = 0 adjustBruteLoss(0) adjustToxLoss(0) @@ -80,18 +80,18 @@ src.sleeping-- if(src.resting) - Weaken(5) + Knockdown(5) if(health <= 0 && src.stat != 2) //die only once death() if (src.stat != 2) //Alive. - if (src.paralysis || src.stunned || src.weakened) //Stunned etc. + if (src.paralysis || src.stunned || src.knockdown) //Stunned etc. src.stat = 1 if (src.stunned > 0) AdjustStunned(-1) - if (src.weakened > 0) - AdjustWeakened(-1) + if (src.knockdown > 0) + AdjustKnockdown(-1) if (src.paralysis > 0) AdjustParalysis(-1) src.blinded = 1 @@ -334,7 +334,7 @@ //Robots on fire /mob/living/silicon/robot/update_canmove() - if(paralysis || stunned || weakened || locked_to || lockcharge) + if(paralysis || stunned || knockdown || locked_to || lockcharge) canmove = 0 else canmove = 1 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index aa8f3991e06..b321ef6aac2 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1016,7 +1016,7 @@ if (M.class == "combat") damage += 15 if(prob(20)) - weakened = max(weakened,4) + knockdown = max(knockdown,4) stunned = max(stunned,4) What is this?*/ diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 25638ca6592..9544f452aa1 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -160,7 +160,7 @@ if(STUN) stunned = max(stunned,(effect/(blocked+1))) if(WEAKEN) - weakened = max(weakened,(effect/(blocked+1))) + knockdown = max(knockdown,(effect/(blocked+1))) if(PARALYZE) paralysis = max(paralysis,(effect/(blocked+1))) if(IRRADIATE) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 6e5c1f7c9fe..15dec5b364a 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -139,7 +139,7 @@ /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob) if(!stat && M.a_intent == I_DISARM && icon_state != icon_dead) M.visible_message("[M] tips over [src].","You tip over [src].") - Weaken(30) + Knockdown(30) icon_state = icon_dead spawn(rand(20,50)) if(!stat && M) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index fbc1e843725..ab260ff01d1 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -99,7 +99,7 @@ var/mob/living/carbon/L = . if(istype(L)) if(prob(15)) - L.Weaken(3) + L.Knockdown(3) L.visible_message("\the [src] knocks down \the [L]!") /mob/living/simple_animal/hostile/carp/baby diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index c5314a4a14a..f10acb491b8 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -48,7 +48,7 @@ var/mob/living/L = . if(istype(L)) if(prob(12)) - L.Weaken(3) + L.Knockdown(3) L.visible_message("\the [src] knocks down \the [L]!") /mob/living/simple_animal/hostile/faithless/cult diff --git a/code/modules/mob/living/simple_animal/hostile/frog.dm b/code/modules/mob/living/simple_animal/hostile/frog.dm index da260de079b..83f487c988a 100644 --- a/code/modules/mob/living/simple_animal/hostile/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/frog.dm @@ -157,7 +157,7 @@ if(prob(10)) to_chat(L, "\The [src] throws you to the ground!") - L.Weaken(rand(2,5)) + L.Knockdown(rand(2,5)) /mob/living/simple_animal/hostile/frog/adjustBruteLoss(amount) .=..() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 4257c1cb4cf..32c55085201 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -288,7 +288,7 @@ var/global/list/crate_mimic_disguises = list(\ if(H in locked) if(prob(20)) to_chat(H, "You feel very weak!") - H.Weaken(3) + H.Knockdown(3) /mob/living/simple_animal/hostile/mimic/crate/chest/LoseTarget() if(target in get_locked(/datum/locking_category/mimic)) @@ -628,7 +628,7 @@ var/global/list/protected_objects = list( var/mob/living/L = . if(istype(L)) if(prob(15)) - L.Weaken(1) + L.Knockdown(1) L.visible_message("\the [src] knocks down \the [L]!") diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 28fa8157a95..9aad540cc61 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -476,7 +476,7 @@ obj/item/asteroid/basilisk_hide/New() /obj/effect/goliath_tentacle/proc/Trip() for(var/mob/living/M in src.loc) - M.Weaken(5) + M.Knockdown(5) visible_message("The [src.name] knocks [M.name] down!") qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/cluwne.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/cluwne.dm index 9021285c4a8..3cd770a7803 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/cluwne.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/cluwne.dm @@ -152,7 +152,7 @@ var/mob/living/L = target_mob L.attack_animal(src) if(prob(10)) - L.Weaken(5) + L.Knockdown(5) L.visible_message("\the [src] slips \the [L]!") for(var/mob/H in viewers(src, null)) if(istype(H, /mob/living/simple_animal/clown)) @@ -245,7 +245,7 @@ if(isliving(target)) var/mob/living/L = target if(prob(10)) - L.Weaken(5) + L.Knockdown(5) L.visible_message("\The [src.name] slips \the [L.name]!") return return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 489dafa7cba..538527c5e09 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -48,7 +48,7 @@ var/mob/living/L = . if(istype(L)) if(prob(15)) - L.Weaken(3) + L.Knockdown(3) L.visible_message("\the [src] knocks down \the [L]!") /mob/living/simple_animal/hostile/tree/Die() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index d85f226e665..e22344dcb98 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -165,8 +165,8 @@ var/global/list/animal_count = list() //Stores types, and amount of animals of t if(stunned) AdjustStunned(-1) - if(weakened) - AdjustWeakened(-1) + if(knockdown) + AdjustKnockdown(-1) if(paralysis) AdjustParalysis(-1) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index fca23e54652..146bb593f60 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1447,7 +1447,7 @@ var/list/slot_equipment_priority = list( \ lying = (category.flags & LOCKED_SHOULD_LIE) ? TRUE : FALSE //A lying value that !=1 will break this - else if(isUnconscious() || weakened || paralysis || resting || !can_stand) + else if(isUnconscious() || knockdown || paralysis || resting || !can_stand) stop_pulling() lying = 1 canmove = 0 @@ -1554,21 +1554,21 @@ var/list/slot_equipment_priority = list( \ stunned = max(stunned + amount,0) return -/mob/proc/Weaken(amount) - if(status_flags & CANWEAKEN) - weakened = max(max(weakened,amount),0) +/mob/proc/Knockdown(amount) + if(status_flags & CANKNOCKDOWN) + knockdown = max(max(knockdown,amount),0) update_canmove() //updates lying, canmove and icons return -/mob/proc/SetWeakened(amount) - if(status_flags & CANWEAKEN) - weakened = max(amount,0) +/mob/proc/SetKnockdown(amount) + if(status_flags & CANKNOCKDOWN) + knockdown = max(amount,0) update_canmove() //updates lying, canmove and icons return -/mob/proc/AdjustWeakened(amount) - if(status_flags & CANWEAKEN) - weakened = max(weakened + amount,0) +/mob/proc/AdjustKnockdown(amount) + if(status_flags & CANKNOCKDOWN) + knockdown = max(knockdown + amount,0) update_canmove() //updates lying, canmove and icons return diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 2d28b3131bb..d7f136a4acf 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -134,7 +134,7 @@ var/overeatduration = 0 // How long this guy is overeating //Carbon var/paralysis = 0.0 var/stunned = 0.0 - var/weakened = 0.0 + var/knockdown = 0.0 var/losebreath = 0.0//Carbon var/nobreath = 0.0//Carbon, but only used for humans so far var/intent = null//Living @@ -223,7 +223,7 @@ var/update_icon = 1 //Set to 1 to trigger update_icons() at the next life() call - var/status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH //bitflags defining which status effects can be inflicted (replaces canweaken, canstun, etc) + var/status_flags = CANSTUN|CANKNOCKDOWN|CANPARALYSE|CANPUSH //bitflags defining which status effects can be inflicted (replaces CANKNOCKDOWN, canstun, etc) var/digitalcamo = 0 // Can they be tracked by the AI? diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index f07a55992b4..68ee69f0765 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -103,7 +103,7 @@ L.adjustOxyLoss(1) if(state >= GRAB_KILL) - affecting.Weaken(5) //Should keep you down unless you get help. + affecting.Knockdown(5) //Should keep you down unless you get help. affecting.losebreath = min(affecting.losebreath + 2, 3) /obj/item/weapon/grab/attack_self() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 8b8f0a918ec..289b305acde 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -7,7 +7,7 @@ return 1 /mob/proc/isStunned() //Because we have around four slighly different stunned variables for some reason. - if(isUnconscious() || paralysis || stunned || weakened) + if(isUnconscious() || paralysis || stunned || knockdown) return 1 /mob/proc/incapacitated() diff --git a/code/modules/projectiles/guns/energy/gravitywell.dm b/code/modules/projectiles/guns/energy/gravitywell.dm index be9fe7e4e7d..e9cbfc1e91f 100644 --- a/code/modules/projectiles/guns/energy/gravitywell.dm +++ b/code/modules/projectiles/guns/energy/gravitywell.dm @@ -62,7 +62,7 @@ M.adjustBruteLossByPart(rand(5, 20), LIMB_CHEST, src) M.adjustBruteLossByPart(rand(5, 20), LIMB_GROIN, src) M.adjustBruteLossByPart(rand(5, 20), LIMB_HEAD, src) - M.Weaken(20) + M.Knockdown(20) to_chat(M, "\The [src] generates a gravity well inside itself!.") new/obj/effect/overlay/gravitywell(loc) M.drop_item(src, force_drop = 1) diff --git a/code/modules/projectiles/guns/projectile/constructable/blinder.dm b/code/modules/projectiles/guns/projectile/constructable/blinder.dm index 2da4478d96b..5c3a6e7720c 100644 --- a/code/modules/projectiles/guns/projectile/constructable/blinder.dm +++ b/code/modules/projectiles/guns/projectile/constructable/blinder.dm @@ -72,7 +72,7 @@ M.flash_eyes(visual = 1) if(issilicon(M)) - M.Weaken(rand(5, 10)) + M.Knockdown(rand(5, 10)) M.visible_message("[M]'s sensors are overloaded by the flash of light!","Your sensors are overloaded by the flash of light!") if(ishuman(M)) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index a6c4c4954a0..61ef28206b6 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -602,7 +602,7 @@ var/list/beam_master = list() if(istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/M = target if(istype(M.wear_suit, /obj/item/clothing/suit/redtag)) - M.Weaken(5) + M.Knockdown(5) return 1 /obj/item/projectile/beam/lasertag/red @@ -617,7 +617,7 @@ var/list/beam_master = list() if(istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/M = target if(istype(M.wear_suit, /obj/item/clothing/suit/bluetag)) - M.Weaken(5) + M.Knockdown(5) return 1 /obj/item/projectile/beam/lasertag/omni//A laser tag bolt that stuns EVERYONE @@ -632,7 +632,7 @@ var/list/beam_master = list() if(istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/M = target if((istype(M.wear_suit, /obj/item/clothing/suit/bluetag))||(istype(M.wear_suit, /obj/item/clothing/suit/redtag))) - M.Weaken(5) + M.Knockdown(5) return 1 /obj/item/projectile/beam/bison diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index b7f5731345c..57bd74aafaa 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -297,7 +297,7 @@ M.playsound_local(starting, 'sound/weapons/hecate_fire_far.ogg', 25, 1) for (var/mob/living/carbon/human/H in range(src,1)) if(!H.earprot()) - H.Weaken(2) + H.Knockdown(2) H.Stun(2) H.ear_damage += rand(3, 5) H.ear_deaf = max(H.ear_deaf,15) diff --git a/code/modules/projectiles/projectile/gravitywell.dm b/code/modules/projectiles/projectile/gravitywell.dm index 6c8d03263e7..89a1350c4b3 100644 --- a/code/modules/projectiles/projectile/gravitywell.dm +++ b/code/modules/projectiles/projectile/gravitywell.dm @@ -20,7 +20,7 @@ if(isliving(A)) var/mob/living/M = A - M.Weaken(5) + M.Knockdown(5) forceMove(get_step(loc,dir)) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index ff364792e07..574aa3a271d 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -123,7 +123,7 @@ if((H.species.flags & IS_PLANT)) if(prob(mutstrength*2)) M.apply_effect((rand(30,80)),IRRADIATE) - M.Weaken(5) + M.Knockdown(5) for (var/mob/V in viewers(src)) V.show_message("[M] writhes in pain as \his vacuoles boil.", 1, "You hear the crunching of leaves.", 2) if(prob(mutstrength*3)) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index b561582a280..ba70a9e5428 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -714,7 +714,7 @@ if(25 to INFINITY) M.sleeping += 1 M.adjustOxyLoss(-M.getOxyLoss()) - M.SetWeakened(0) + M.SetKnockdown(0) M.SetStunned(0) M.SetParalysis(0) M.dizziness = 0 @@ -1982,7 +1982,7 @@ M.sdisabilities = 0 M.eye_blurry = 0 M.eye_blind = 0 - M.SetWeakened(0) + M.SetKnockdown(0) M.SetStunned(0) M.SetParalysis(0) M.silent = 0 @@ -2015,7 +2015,7 @@ M.drowsyness = max(M.drowsyness- 5, 0) M.AdjustParalysis(-1) M.AdjustStunned(-1) - M.AdjustWeakened(-1) + M.AdjustKnockdown(-1) if(holder.has_reagent("mindbreaker")) holder.remove_reagent("mindbreaker", 5) M.hallucination = max(0, M.hallucination - 10) @@ -2288,7 +2288,7 @@ M.status_flags &= ~FAKEDEATH M.adjustOxyLoss(0.5 * REM) M.adjustToxLoss(0.5 * REM) - M.Weaken(10) + M.Knockdown(10) M.silent = max(M.silent, 10) M.tod = worldtime2text() @@ -4883,7 +4883,7 @@ return 1 M.adjustOxyLoss(1) - M.weakened = max(M.weakened, 15) + M.SetKnockdown(max(M.knockdown, 15)) M.silent = max(M.silent, 15) /datum/reagent/drink/bananahonk diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index ac49e840950..bc0f2e59928 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -463,7 +463,7 @@ if(get_dist(M, location) <= 3) if(eye_safety < 1) M.flash_eyes(visual = 1) - M.Weaken(15) + M.Knockdown(15) else if(get_dist(M, location) <= 5) if(eye_safety < 1) M.flash_eyes(visual = 1) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 4d67b8427a5..1b5c919009d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3837,7 +3837,7 @@ to_chat(H, "You slipped on the [name]!") playsound(get_turf(src), 'sound/misc/slip.ogg', 50, 1, -3) H.Stun(3) - H.Weaken(2) + H.Knockdown(2) ////////////////SLIDERS END//////////////// diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 7aba659163e..cfc6663b726 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -123,7 +123,7 @@ if(thorns_apply_damage(M, affecting)) to_chat(H, "You step on \the [src]'s sharp thorns!") if(H.species && !(H.species.flags & NO_PAIN)) - H.Weaken(3) + H.Knockdown(3) if(stinging_apply_reagents(M)) to_chat(H, "You step on \the [src]'s stingers!") potency -= rand(1,(potency/3)+1) @@ -842,7 +842,7 @@ for(var/mob/living/carbon/C in view(1)) if(C.CheckSlip() < 1) continue - C.Weaken(5) + C.Knockdown(5) playsound(get_turf(src), 'sound/effects/bang.ogg', 10, 1) qdel(src) diff --git a/code/modules/research/research_shuttle.dm b/code/modules/research/research_shuttle.dm index 63d510a9f7d..856007310a7 100644 --- a/code/modules/research/research_shuttle.dm +++ b/code/modules/research/research_shuttle.dm @@ -69,7 +69,7 @@ proc/move_research_shuttle() shake_camera(M, 10, 1) // unlocked_to, HOLY SHIT SHAKE THE ROOM if(istype(M, /mob/living/carbon)) if(!M.locked_to) - M.Weaken(3) + M.Knockdown(3) research_shuttle_moving = 0 return diff --git a/code/modules/research/xenoarchaeology/artifact/effect_old.dm b/code/modules/research/xenoarchaeology/artifact/effect_old.dm index 95554bcdbd3..7a8b9e100e4 100644 --- a/code/modules/research/xenoarchaeology/artifact/effect_old.dm +++ b/code/modules/research/xenoarchaeology/artifact/effect_old.dm @@ -110,16 +110,16 @@ user.radiation += 25 user.nutrition -= min(50, user.nutrition) user.Dizzy(6) - user.weakened += 6 + user.AdjustKnockdown(6) return 1 to_chat(else user, "Nothing happens.") if("stun") if (istype(user, /mob/living/carbon/)) to_chat(user, "A powerful force overwhelms your consciousness.") - user.weakened += 45 + user.AdjustKnockdown(45) user.stuttering += 45 if(prob(50)) - user.stunned += rand(1,10) + user.AdjustStunned(rand(1,10)) return 1 to_chat(else user, "Nothing happens.") if("roboheal") @@ -199,8 +199,8 @@ to_chat(if(prob(10)) M, "Energy radiating from the [originator] is making you feel numb.") if(prob(20)) to_chat(M, "Your body goes numb for a moment.") - M.stunned += 2 - M.weakened += 2 + M.AdjustStunned(2) + M.AdjustKnockdown(2) M.stuttering += 2 return 1 if("roboheal") @@ -288,7 +288,7 @@ M.adjustOxyLoss(5) M.adjustBrainLoss(5) M.Dizzy(6) - M.weakened += 3 + M.AdjustKnockdown(3) M.updatehealth() return 1 if("stun") @@ -296,8 +296,8 @@ if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue to_chat(M, "A wave of energy overwhelms your senses!") - M.paralysis += 3 - M.weakened += 4 + M.AdjustParalysis(3) + M.AdjustKnockdown(4) M.stuttering += 4 return 1 if("roboheal") @@ -425,8 +425,8 @@ if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly)) continue to_chat(M, "A powerful force causes you to black out momentarily.") - M.paralysis += 5 - M.weakened += 8 + M.AdjustParalysis(5) + M.AdjustKnockdown(8) M.stuttering += 8 return 1 if("roboheal") diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm index c45c5c55994..3ee76016867 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm @@ -17,7 +17,7 @@ C.radiation += 25 * weakness C.nutrition -= min(50 * weakness, C.nutrition) C.Dizzy(6 * weakness) - C.weakened += 6 * weakness + C.AdjustKnockdown(6 * weakness) /datum/artifact_effect/hurt/DoEffectAura() if(holder) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm index bb55eb86352..e9a0725e0df 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm @@ -12,9 +12,9 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) to_chat(C, "A powerful force overwhelms your consciousness.") - C.weakened += 45 * weakness + C.AdjustKnockdown(45 * weakness) C.stuttering += 45 * weakness - C.stunned += rand(1,10) * weakness + C.AdjustStunned(rand(1,10) * weakness) /datum/artifact_effect/stun/DoEffectAura() if(holder) @@ -22,10 +22,10 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(10 * weakness)) to_chat(C, "Your body goes numb for a moment.") - C.weakened += 2 + C.AdjustKnockdown(2) C.stuttering += 2 if(prob(10)) - C.stunned += 1 + C.AdjustStunned(1) else if(prob(10)) to_chat(C, "You feel numb.") @@ -35,7 +35,7 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(100 * weakness)) to_chat(C, "A wave of energy overwhelms your senses!") - C.weakened += 4 * weakness + C.AdjustKnockdown(4 * weakness) C.stuttering += 4 * weakness if(prob(10)) - C.stunned += 1 * weakness + C.AdjustStunned(1 * weakness) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index a62d21aea14..5255c16fc64 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -31,14 +31,14 @@ var/turf/T = get_turf(suspension_field) if(field_type == "carbon") for(var/mob/living/carbon/M in T) - M.weakened = max(M.weakened, 3) + M.SetKnockdown(max(M.knockdown, 3)) cell.charge -= power_use if(prob(5)) to_chat(M, "[pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") if(field_type == "iron") for(var/mob/living/silicon/M in T) - M.weakened = max(M.weakened, 3) + M.SetKnockdown(max(M.knockdown, 3)) cell.charge -= power_use if(prob(5)) to_chat(M, "[pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") @@ -50,7 +50,7 @@ I.forceMove(suspension_field) for(var/mob/living/simple_animal/M in T) - M.weakened = max(M.weakened, 3) + M.SetKnockdown(max(M.knockdown, 3)) cell.charge -= power_use if(prob(5)) to_chat(M, "[pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") @@ -255,7 +255,7 @@ if("carbon") success = 1 for(var/mob/living/carbon/C in T) - C.weakened += 5 + C.AdjustKnockdown(5) C.visible_message("[bicon(C)] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") if("nitrogen") success = 1 @@ -278,7 +278,7 @@ if("iron") success = 1 for(var/mob/living/silicon/R in T) - R.weakened += 5 + R.AdjustKnockdown(5) R.visible_message("[bicon(R)] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.") // //in case we have a bad field type @@ -287,7 +287,7 @@ for(var/mob/living/simple_animal/C in T) C.visible_message("[bicon(C)] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.") - C.weakened += 5 + C.AdjustKnockdown(5) suspension_field = new(T) suspension_field.field_type = field_type @@ -314,7 +314,7 @@ for(var/mob/M in T) to_chat(M, "You no longer feel like floating.") - M.weakened = min(M.weakened, 3) + M.SetKnockdown(min(M.knockdown, 3)) src.visible_message("[bicon(src)] [src] deactivates with a gentle shudder.") qdel(suspension_field) diff --git a/code/modules/spells/spell_code.dm b/code/modules/spells/spell_code.dm index 3d7b6fa7068..169f2c7d223 100644 --- a/code/modules/spells/spell_code.dm +++ b/code/modules/spells/spell_code.dm @@ -239,8 +239,8 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now target.adjustOxyLoss(amount) if("stunned") target.AdjustStunned(amount) - if("weakened") - target.AdjustWeakened(amount) + if("knockdown") + target.AdjustKnockdown(amount) if("paralysis") target.AdjustParalysis(amount) if("plasma") diff --git a/code/modules/spells/targeted/buttbots_revenge.dm b/code/modules/spells/targeted/buttbots_revenge.dm index 3fc0e6ef84b..2b0f37c9f34 100644 --- a/code/modules/spells/targeted/buttbots_revenge.dm +++ b/code/modules/spells/targeted/buttbots_revenge.dm @@ -14,11 +14,11 @@ sparks_spread = 1 sparks_amt = 4 - amt_weakened = 8 + amt_knockdown = 8 amt_stunned = 8 hud_state = "wiz_butt" - + var/summon_bot = 0 /spell/targeted/buttbots_revenge/cast(var/list/targets) @@ -29,7 +29,7 @@ if(C.op_stage.butt != 4) // does the target have an ass if(summon_bot) new /obj/machinery/bot/buttbot(C.loc) - else + else var/obj/item/clothing/head/butt/B = new(C.loc) B.transfer_buttdentity(C) C.op_stage.butt = 4 //No having two butts. @@ -38,7 +38,7 @@ C.apply_damage(40, BRUTE, LIMB_GROIN) C.apply_damage(10, BURN, LIMB_GROIN) return - + /spell/targeted/buttbots_revenge/empower_spell() spell_levels[Sp_POWER]++ summon_bot = 1 @@ -48,7 +48,7 @@ desc = "This spell removes the target's ass in a firey explosion, turning it into a fully functioning butt-bot." return upgrade_desc - + /spell/targeted/buttbots_revenge/get_upgrade_info(upgrade_type, level) if(upgrade_type == Sp_POWER) return "Make the spell instead summon a butt-bot at the target's location." diff --git a/code/modules/spells/targeted/projectile/magic_missile.dm b/code/modules/spells/targeted/projectile/magic_missile.dm index 357aa65e23b..a06e69934c1 100644 --- a/code/modules/spells/targeted/projectile/magic_missile.dm +++ b/code/modules/spells/targeted/projectile/magic_missile.dm @@ -19,7 +19,7 @@ hud_state = "wiz_mm" - amt_weakened = 3 + amt_knockdown = 3 amt_stunned = 3 amt_dam_fire = 10 diff --git a/code/modules/spells/targeted/targeted.dm b/code/modules/spells/targeted/targeted.dm index 51ed1077aac..0db601249a3 100644 --- a/code/modules/spells/targeted/targeted.dm +++ b/code/modules/spells/targeted/targeted.dm @@ -11,7 +11,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp var/target_ignore_prev = 1 //only important if max_targets > 1, affects if the spell can be cast multiple times at one person from one cast - var/amt_weakened = 0 + var/amt_knockdown = 0 var/amt_paralysis = 0 var/amt_stunned = 0 @@ -158,10 +158,10 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp target.adjustToxLoss(amt_dam_tox) target.adjustOxyLoss(amt_dam_oxy) //disabling - target.Weaken(amt_weakened) + target.Knockdown(amt_knockdown) target.Paralyse(amt_paralysis) target.Stun(amt_stunned) - if(amt_weakened || amt_paralysis || amt_stunned) + if(amt_knockdown || amt_paralysis || amt_stunned) target.unlock_from() target.eye_blind += amt_eye_blind target.eye_blurry += amt_eye_blurry diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index e818b49c93a..eb92f7501b1 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -264,7 +264,7 @@ M.sleeping = 0 M.stuttering += 20 M.ear_deaf += 30 - M.Weaken(3) + M.Knockdown(3) if(prob(30)) M.Stun(10) M.Paralyse(4) diff --git a/code/unused/goonheist/genetics2/BioEffectsVerbs.dm b/code/unused/goonheist/genetics2/BioEffectsVerbs.dm index 8a69e00cca2..9d2cc8c9fe0 100644 --- a/code/unused/goonheist/genetics2/BioEffectsVerbs.dm +++ b/code/unused/goonheist/genetics2/BioEffectsVerbs.dm @@ -227,16 +227,16 @@ if (usr:bioHolder.HasEffect("fat") && prob(66)) usr.visible_message("[usr.name] crashes due to their heavy weight!") playsound(usr.loc, 'zhit.wav', 50, 1) - usr.weakened += 10 - usr.stunned += 5 + usr.AdjustKnockdown(10) + usr.AdjustStunned(5) usr.layer = prevLayer if (istype(usr.loc,/obj/)) var/obj/container = usr.loc to_chat(usr, "You leap and slam your head against the inside of [container]! Ouch!") - usr.paralysis += 3 - usr.weakened += 5 + usr.AdjustParalysis(3) + usr.AdjustKnockdown(5) container.visible_message("[usr.loc] emits a loud thump and rattles a bit.") playsound(usr.loc, 'bang.ogg', 50, 1) var/wiggle = 6 @@ -646,7 +646,7 @@ if (V == L) continue to_chat(V, "You are sent flying!") - V.weakened += 5 // why the hell was this set to 12 christ + V.AdjustKnockdown(5) // why the hell was this set to 12 christ step_away(V,get_turf(L),15) step_away(V,get_turf(L),15) step_away(V,get_turf(L),15) diff --git a/code/unused/goonheist/genetics2/bioEffects.dm b/code/unused/goonheist/genetics2/bioEffects.dm index 5354df6a9d7..d3c60d2ed68 100644 --- a/code/unused/goonheist/genetics2/bioEffects.dm +++ b/code/unused/goonheist/genetics2/bioEffects.dm @@ -529,7 +529,7 @@ if (owner:health <= 25) timeLeft = 1 to_chat(owner, "You suddenly feel very weak.") - owner:weakened = 3 + owner:SetKnockdown(3) owner:emote("collapse") diff --git a/code/unused/hivebot/hivebot.dm b/code/unused/hivebot/hivebot.dm index c5ae7cf808d..cf91ab96d20 100644 --- a/code/unused/hivebot/hivebot.dm +++ b/code/unused/hivebot/hivebot.dm @@ -215,8 +215,8 @@ if (M.class == "combat") damage += 15 if(prob(20)) - src.weakened = max(src.weakened,4) - src.stunned = max(src.stunned,4) + src.SetKnockdown(max(src.knockdown,4)) + src.SetStunned(max(src.stunned,4)) */ playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1) for(var/mob/O in viewers(src, null)) diff --git a/code/unused/hivebot/life.dm b/code/unused/hivebot/life.dm index c3ebcd29042..559efaa01c2 100644 --- a/code/unused/hivebot/life.dm +++ b/code/unused/hivebot/life.dm @@ -32,7 +32,7 @@ stunned = max(min(stunned, 10),0) paralysis = max(min(paralysis, 1), 0) - weakened = max(min(weakened, 15), 0) + knockdown = max(min(knockdown, 15), 0) sleeping = max(min(sleeping, 1), 0) setToxLoss(0) setOxyLoss(0) @@ -83,8 +83,8 @@ if (src.stunned > 0) src.stunned-- src.stat = 0 - if (src.weakened > 0) - src.weakened-- + if (src.knockdown > 0) + src.knockdown-- src.lying = 0 src.stat = 0 if (src.paralysis > 0) diff --git a/maps/RandomZLevels/wildwest.dm b/maps/RandomZLevels/wildwest.dm index f99a7745b71..e5da0d0a2e0 100644 --- a/maps/RandomZLevels/wildwest.dm +++ b/maps/RandomZLevels/wildwest.dm @@ -166,7 +166,7 @@ C.setCloneLoss(0) C.SetParalysis(0) C.SetStunned(0) - C.SetWeakened(0) + C.SetKnockdown(0) C.radiation = 0 C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() diff --git a/maps/randomvaults/dance_revolution.dm b/maps/randomvaults/dance_revolution.dm index 9a5556c5e07..6d38c592f82 100644 --- a/maps/randomvaults/dance_revolution.dm +++ b/maps/randomvaults/dance_revolution.dm @@ -67,7 +67,7 @@ /obj/structure/dance_dance_revolution/proc/lose() to_chat(dancer, "You lose! Your muscles hurt from all the dancing.") visible_message("A red screen briefly flashes on \the [src].") - dancer.Weaken(5) + dancer.Knockdown(5) for(var/i=0 to rand(1,5)) dancer.adjustBruteLoss(rand(1,5))