From 73c7831f60480f39470540a66c63b61cb4deb5c3 Mon Sep 17 00:00:00 2001 From: Joker66613 Date: Sun, 17 Mar 2024 01:24:07 +0100 Subject: [PATCH] tweaks --- aquila/code/game/gamemodes/vampire/vampire.dm | 2 +- .../code/game/gamemodes/vampire/vampire_bat.dm | 10 ++++------ .../game/gamemodes/vampire/vampire_powers.dm | 6 +++--- .../code/modules/antagonists/vampire/vampire.dm | 16 ++++++++-------- config/game_options.txt | 3 +++ 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/aquila/code/game/gamemodes/vampire/vampire.dm b/aquila/code/game/gamemodes/vampire/vampire.dm index 7fba3bd05e4..15fd2867e18 100644 --- a/aquila/code/game/gamemodes/vampire/vampire.dm +++ b/aquila/code/game/gamemodes/vampire/vampire.dm @@ -22,7 +22,7 @@ role_preference = /datum/role_preference/antagonist/vampire false_report_weight = 1 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Head of Security", "Captain", "Security Officer", "Chaplain", "Detective", "Warden", "Head of Personnel") + protected_jobs = list("Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Security Officer", "Chaplain", "Detective", "Warden") required_players = 15 required_enemies = 1 recommended_enemies = 3 diff --git a/aquila/code/game/gamemodes/vampire/vampire_bat.dm b/aquila/code/game/gamemodes/vampire/vampire_bat.dm index b8b48d74f97..80f2bb748ce 100644 --- a/aquila/code/game/gamemodes/vampire/vampire_bat.dm +++ b/aquila/code/game/gamemodes/vampire/vampire_bat.dm @@ -26,8 +26,12 @@ health = 20 + speed = 0 + see_in_dark = 10 + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + melee_damage = 7 @@ -53,12 +57,6 @@ speak_emote = list("squeaks") - var/max_co2 = 0 //to be removed once metastation map no longer use those for Sgt Araneus - - var/min_oxy = 0 - - var/max_tox = 0 - diff --git a/aquila/code/game/gamemodes/vampire/vampire_powers.dm b/aquila/code/game/gamemodes/vampire/vampire_powers.dm index c3c4477da1a..7ece2f4a6c1 100644 --- a/aquila/code/game/gamemodes/vampire/vampire_powers.dm +++ b/aquila/code/game/gamemodes/vampire/vampire_powers.dm @@ -106,7 +106,7 @@ /obj/effect/proc_holder/spell/targeted/hypnotise - name = "Hypnotize" + name = "Hypnotize (20)" desc= "A piercing stare that incapacitates your victim for a good length of time." action_icon_state = "hypnotize" blood_used = 0 @@ -215,7 +215,7 @@ to_chat(C, "You hear a ear piercing shriek and your senses dull!") C.Knockdown(40) C.adjustEarDamage(0, 30) - C.stuttering = 250 + C.stuttering = 30 C.Stun(40) C.Jitter(150) for(var/obj/structure/window/W in view(4)) @@ -277,7 +277,7 @@ to_chat(target, "Wicked shadows invade your sight, beckoning to you.") to_chat(user, "We begin to drain [target]'s blood in, so Lilith can bless it.") if(2) - to_chat(target, "Demonic whispers fill your mind, and they become irressistible...") + to_chat(target, "Demonic whispers fill your mind, and they become irresistible...") if(3) to_chat(target, "The world blanks out, and you see a demo- no ange- demon- lil- glory- blessing... Lilith.") to_chat(user, "Excitement builds up in you as [target] sees the blessing of Lilith.") diff --git a/aquila/code/modules/antagonists/vampire/vampire.dm b/aquila/code/modules/antagonists/vampire/vampire.dm index c784d5b193e..31b99b87812 100644 --- a/aquila/code/modules/antagonists/vampire/vampire.dm +++ b/aquila/code/modules/antagonists/vampire/vampire.dm @@ -29,14 +29,14 @@ /obj/effect/proc_holder/spell/self/shapeshift = 75, /obj/effect/proc_holder/spell/self/cloak = 100, /obj/effect/proc_holder/spell/self/revive = 100, - /obj/effect/proc_holder/spell/targeted/disease = 200,//why is spell-that-kills-people unlocked so early what the fuck + /obj/effect/proc_holder/spell/targeted/disease = 225,//why is spell-that-kills-people unlocked so early what the fuck /obj/effect/proc_holder/spell/self/batform = 200, - /obj/effect/proc_holder/spell/self/screech = 215, + /obj/effect/proc_holder/spell/self/screech = 200, /obj/effect/proc_holder/spell/bats = 250, - /datum/vampire_passive/regen = 255, + /datum/vampire_passive/regen = 250, /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/mistform = 300, - /datum/vampire_passive/full = 420, - /obj/effect/proc_holder/spell/self/summon_coat = 420, + /datum/vampire_passive/full = 400, + /obj/effect/proc_holder/spell/self/summon_coat = 400, /obj/effect/proc_holder/spell/targeted/vampirize = 450) /datum/antagonist/vampire/new_blood @@ -53,7 +53,7 @@ usable_blood = ALL_POWERS_UNLOCKED total_blood = ALL_POWERS_UNLOCKED check_vampire_upgrade() - message_admins("[key_name_admin(admin)] made [owner.current] a full power vampire..") + message_admins("[key_name_admin(admin)] made [owner.current] a full-power vampire..") log_admin("[key_name(admin)] made [owner.current] a full power vampire..") /datum/antagonist/vampire/proc/admin_set_blood(mob/admin) @@ -105,7 +105,7 @@ /datum/antagonist/vampire/greet() to_chat(owner, "You are a Vampire!") to_chat(owner, "You are a creature of the night -- holy water, the chapel, and space will cause you to burn.") - to_chat(owner, "Hit someone in the head with harm intent to start sucking their blood. However, only blood from living, non-vampiric creatures is usable!") + to_chat(owner, "Hit someone in the head with harm intent and an open hand to start sucking their blood. However, only blood from living, non-vampiric creatures is usable!") to_chat(owner, "Coffins will heal you.") if(full_vampire == FALSE) to_chat(owner, "You are not required to obey other vampires, however, you have gained a respect for them.") @@ -260,7 +260,7 @@ O.visible_message("[O] grabs [H]'s neck harshly and sinks in their fangs!", "You sink your fangs into [H] and begin to [blood_to_take > BLOOD_SUCK_BASE ? "quickly" : ""] drain their blood.", "You hear a soft puncture and a wet sucking noise.") playsound(O.loc, 'sound/weapons/bite.ogg', 50, 1) else - to_chat(O, "You stealthily begin to drain blood from [H], be careful, as they will notice if their blood gets too low.") + to_chat(O, "You stealthily begin to drain blood from [H]. Be careful, as they will notice if their blood gets too low.") O.playsound_local(O, 'sound/weapons/bite.ogg', 50, 1) if(!iscarbon(owner)) H.LAssailant = null diff --git a/config/game_options.txt b/config/game_options.txt index 3710bad6235..52eef4d78bb 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -132,6 +132,8 @@ PROBABILITY TRAITORBRO 1 #Everyone hates this anyways... PROBABILITY MONKEY 0 PROBABILITY TRAITORVAMP 1 PROBABILITY VAMPIRE 1 +PROBABILITY INFILTRATION 1 + ## Dynamic gamemode go brrr PROBABILITY DYNAMIC 0 @@ -167,6 +169,7 @@ CONTINUOUS PVP CONTINUOUS BLOODLING CONTINUOUS OVERTHROW CONTINUOUS MONKEY +CONTINUOUS VAMPIRE #Prevents the death of round-ending antagonist rulesets ending the round immediately.