Skip to content

Vampire Antag Ban Fix #4786

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
KevinfromHP wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −10
Open

Vampire Antag Ban Fix #4786

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
1 change: 0 additions & 1 deletion code/__DEFINES/role_bans.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#define ALL_ANTAG_BANS list(,\
ROLE_MANIAC,\
ROLE_WEREWOLF,\
ROLE_VAMPIRE,\
ROLE_NBEAST,\
ROLE_BANDIT,\
ROLE_PREBEL,\
Expand Down
4 changes: 1 addition & 3 deletions code/__DEFINES/role_preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
//then you MUST update the database!
#define ROLE_MANIAC "Maniac"
#define ROLE_WEREWOLF "Werewolf"
#define ROLE_VAMPIRE "Vampire"
#define ROLE_NBEAST "Vampire Lord"
#define ROLE_NBEAST "Vampire"
#define ROLE_BANDIT "Bandit"
#define ROLE_DELF "Dark Elf"
#define ROLE_PREBEL "Peasant Rebel"
#define ROLE_ZIZOIDCULTIST "Zizoid Cultist"
#define ROLE_LICH "Lich"
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/storyteller.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ SUBSYSTEM_DEF(gamemode)
if(QDELETED(player) || !player.client || !player.mind || player.mind.picking)
continue

if(job_ban && is_banned_from(player.ckey, list(job_ban)))
if(job_ban && is_banned_from(player.ckey, job_ban))
continue

var/checked_one_box = FALSE
Expand Down
10 changes: 6 additions & 4 deletions code/modules/antagonists/_common/antag_datum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,12 @@ GLOBAL_LIST_EMPTY(antagonists)
else if(owner.current.client?.holder && (CONFIG_GET(flag/auto_deadmin_antagonists) || owner.current.client.prefs?.toggles & DEADMIN_ANTAGONIST))
owner.current.client.holder.auto_deadmin()

/datum/antagonist/proc/is_banned(mob/M)
if(!M)
return FALSE
. = (QDELETED(M))
/datum/antagonist/proc/is_banned(mob/user)
if(QDELETED(user))
return TRUE
if(is_banned_from(user.ckey, name))
return TRUE
return FALSE

/datum/antagonist/proc/on_life(mob/user)
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/villain/vampire/_vampire.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(vampire_objects)
name = "Vampire"
roundend_category = "Vampires"
antagpanel_category = "Vampire"
job_rank = ROLE_VAMPIRE
job_rank = ROLE_NBEAST
antag_hud_type = ANTAG_HUD_VAMPIRE
antag_hud_name = "vamp"
confess_lines = list(
Expand Down
Loading