Skip to content

tweaks #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Joker66613 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tweaks #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aquila/code/game/gamemodes/vampire/vampire.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions aquila/code/game/gamemodes/vampire/vampire_bat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@

health = 20

speed = 0

see_in_dark = 10

lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE

melee_damage = 7


Expand All @@ -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




Expand Down
6 changes: 3 additions & 3 deletions aquila/code/game/gamemodes/vampire/vampire_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -215,7 +215,7 @@
to_chat(C, "<span class='warning'><font size='3'><b>You hear a ear piercing shriek and your senses dull!</font></b></span>")
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))
Expand Down Expand Up @@ -277,7 +277,7 @@
to_chat(target, "<span class='danger'>Wicked shadows invade your sight, beckoning to you.</span>")
to_chat(user, "<span class='notice'>We begin to drain [target]'s blood in, so Lilith can bless it.</span>")
if(2)
to_chat(target, "<span class='danger'>Demonic whispers fill your mind, and they become irressistible...</span>")
to_chat(target, "<span class='danger'>Demonic whispers fill your mind, and they become irresistible...</span>")
if(3)
to_chat(target, "<span class='danger'>The world blanks out, and you see a demo- no ange- demon- lil- glory- blessing... Lilith.</span>")
to_chat(user, "<span class='notice'>Excitement builds up in you as [target] sees the blessing of Lilith.</span>")
Expand Down
16 changes: 8 additions & 8 deletions aquila/code/modules/antagonists/vampire/vampire.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -105,7 +105,7 @@
/datum/antagonist/vampire/greet()
to_chat(owner, "<span class='userdanger'>You are a Vampire!</span>")
to_chat(owner, "<span class='danger bold'>You are a creature of the night -- holy water, the chapel, and space will cause you to burn.</span>")
to_chat(owner, "<span class='userdanger'>Hit someone in the head with harm intent to start sucking their blood. However, only blood from living, non-vampiric creatures is usable!</span>")
to_chat(owner, "<span class='userdanger'>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!</span>")
to_chat(owner, "<span class='notice bold'>Coffins will heal you.</span>")
if(full_vampire == FALSE)
to_chat(owner, "<span class='notice bold'>You are not required to obey other vampires, however, you have gained a respect for them.</span>")
Expand Down Expand Up @@ -260,7 +260,7 @@
O.visible_message("<span class='danger'>[O] grabs [H]'s neck harshly and sinks in their fangs!</span>", "<span class='danger'>You sink your fangs into [H] and begin to [blood_to_take > BLOOD_SUCK_BASE ? "quickly" : ""] drain their blood.</span>", "<span class='notice'>You hear a soft puncture and a wet sucking noise.</span>")
playsound(O.loc, 'sound/weapons/bite.ogg', 50, 1)
else
to_chat(O, "<span class='notice'>You stealthily begin to drain blood from [H], be careful, as they will notice if their blood gets too low.</span>")
to_chat(O, "<span class='notice'>You stealthily begin to drain blood from [H]. Be careful, as they will notice if their blood gets too low.</span>")
O.playsound_local(O, 'sound/weapons/bite.ogg', 50, 1)
if(!iscarbon(owner))
H.LAssailant = null
Expand Down
3 changes: 3 additions & 0 deletions config/game_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down