Skip to content

Commit

Permalink
rename bloodsuckers to vampires
Browse files Browse the repository at this point in the history
  • Loading branch information
mrmanlikesbt committed Jan 11, 2025
1 parent 173d1bc commit 0d817b4
Show file tree
Hide file tree
Showing 141 changed files with 1,712 additions and 1,717 deletions.
92 changes: 46 additions & 46 deletions beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include "code\__DEFINES\basic_mobs.dm"
#include "code\__DEFINES\bitfields.dm"
#include "code\__DEFINES\blood.dm"
#include "code\__DEFINES\bloodsuckers.dm"
#include "code\__DEFINES\vampires.dm"
#include "code\__DEFINES\bodyparts.dm"
#include "code\__DEFINES\bot_defines.dm"
#include "code\__DEFINES\callbacks.dm"
Expand Down Expand Up @@ -375,7 +375,7 @@
#include "code\_onclick\hud\alien_larva.dm"
#include "code\_onclick\hud\blob_overmind.dm"
#include "code\_onclick\hud\blobbernauthud.dm"
#include "code\_onclick\hud\bloodsucker.dm"
#include "code\_onclick\hud\vampire.dm"
#include "code\_onclick\hud\constructs.dm"
#include "code\_onclick\hud\credits.dm"
#include "code\_onclick\hud\drones.dm"
Expand Down Expand Up @@ -1627,7 +1627,7 @@
#include "code\game\objects\structures\artstuff.dm"
#include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\bedsheet_bin.dm"
#include "code\game\objects\structures\bloodsucker_crypt.dm"
#include "code\game\objects\structures\vampire_crypt.dm"
#include "code\game\objects\structures\bot_elevator.dm"
#include "code\game\objects\structures\catwalk.dm"
#include "code\game\objects\structures\crateshelf.dm"
Expand Down Expand Up @@ -1962,49 +1962,49 @@
#include "code\modules\antagonists\blob\structures\resource.dm"
#include "code\modules\antagonists\blob\structures\shield.dm"
#include "code\modules\antagonists\blood_contract\blood_contract.dm"
#include "code\modules\antagonists\bloodsucker\conversion_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\datum_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\daylight_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\frenzy_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\life_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\misc_procs_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\moodlets_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\names_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\objectives_bloodsucker.dm"
#include "code\modules\antagonists\bloodsucker\clans\_clan.dm"
#include "code\modules\antagonists\bloodsucker\clans\assignclan.dm"
#include "code\modules\antagonists\bloodsucker\clans\clan_flavortext.dm"
#include "code\modules\antagonists\bloodsucker\clans\malkavian.dm"
#include "code\modules\antagonists\bloodsucker\clans\nosferatu.dm"
#include "code\modules\antagonists\bloodsucker\clans\tremere.dm"
#include "code\modules\antagonists\bloodsucker\clans\venture.dm"
#include "code\modules\antagonists\bloodsucker\powers\_power.dm"
#include "code\modules\antagonists\bloodsucker\powers\cloak.dm"
#include "code\modules\antagonists\bloodsucker\powers\feed.dm"
#include "code\modules\antagonists\bloodsucker\powers\fortitude.dm"
#include "code\modules\antagonists\bloodsucker\powers\gohome.dm"
#include "code\modules\antagonists\bloodsucker\powers\masquerade.dm"
#include "code\modules\antagonists\bloodsucker\powers\veil.dm"
#include "code\modules\antagonists\bloodsucker\powers\targeted\_targeted.dm"
#include "code\modules\antagonists\bloodsucker\powers\targeted\brawn.dm"
#include "code\modules\antagonists\bloodsucker\powers\targeted\haste.dm"
#include "code\modules\antagonists\bloodsucker\powers\targeted\lunge.dm"
#include "code\modules\antagonists\bloodsucker\powers\targeted\mesmerize.dm"
#include "code\modules\antagonists\bloodsucker\powers\targeted\trespass.dm"
#include "code\modules\antagonists\bloodsucker\powers\tremere\_tremere.dm"
#include "code\modules\antagonists\bloodsucker\powers\tremere\auspex.dm"
#include "code\modules\antagonists\bloodsucker\powers\tremere\dominate.dm"
#include "code\modules\antagonists\bloodsucker\powers\tremere\thaumaturgey.dm"
#include "code\modules\antagonists\bloodsucker\powers\vassal\distress.dm"
#include "code\modules\antagonists\bloodsucker\powers\vassal\recuperate.dm"
#include "code\modules\antagonists\bloodsucker\powers\vassal\revenge_bloodbag.dm"
#include "code\modules\antagonists\bloodsucker\powers\vassal\revenge_checkstatus.dm"
#include "code\modules\antagonists\bloodsucker\powers\vassal\revenge_fold.dm"
#include "code\modules\antagonists\bloodsucker\vassals\datum_vassal.dm"
#include "code\modules\antagonists\bloodsucker\vassals\ex_vassal.dm"
#include "code\modules\antagonists\bloodsucker\vassals\favorite_vassal.dm"
#include "code\modules\antagonists\bloodsucker\vassals\misc_procs_vassal.dm"
#include "code\modules\antagonists\bloodsucker\vassals\revenge_vassal.dm"
#include "code\modules\antagonists\vampire\conversion_vampire.dm"
#include "code\modules\antagonists\vampire\datum_vampire.dm"
#include "code\modules\antagonists\vampire\daylight_vampire.dm"
#include "code\modules\antagonists\vampire\frenzy_vampire.dm"
#include "code\modules\antagonists\vampire\life_vampire.dm"
#include "code\modules\antagonists\vampire\misc_procs_vampire.dm"
#include "code\modules\antagonists\vampire\moodlets_vampire.dm"
#include "code\modules\antagonists\vampire\names_vampire.dm"
#include "code\modules\antagonists\vampire\objectives_vampire.dm"
#include "code\modules\antagonists\vampire\clans\_clan.dm"
#include "code\modules\antagonists\vampire\clans\assignclan.dm"
#include "code\modules\antagonists\vampire\clans\clan_flavortext.dm"
#include "code\modules\antagonists\vampire\clans\malkavian.dm"
#include "code\modules\antagonists\vampire\clans\nosferatu.dm"
#include "code\modules\antagonists\vampire\clans\tremere.dm"
#include "code\modules\antagonists\vampire\clans\venture.dm"
#include "code\modules\antagonists\vampire\powers\_power.dm"
#include "code\modules\antagonists\vampire\powers\cloak.dm"
#include "code\modules\antagonists\vampire\powers\feed.dm"
#include "code\modules\antagonists\vampire\powers\fortitude.dm"
#include "code\modules\antagonists\vampire\powers\gohome.dm"
#include "code\modules\antagonists\vampire\powers\masquerade.dm"
#include "code\modules\antagonists\vampire\powers\veil.dm"
#include "code\modules\antagonists\vampire\powers\targeted\_targeted.dm"
#include "code\modules\antagonists\vampire\powers\targeted\brawn.dm"
#include "code\modules\antagonists\vampire\powers\targeted\haste.dm"
#include "code\modules\antagonists\vampire\powers\targeted\lunge.dm"
#include "code\modules\antagonists\vampire\powers\targeted\mesmerize.dm"
#include "code\modules\antagonists\vampire\powers\targeted\trespass.dm"
#include "code\modules\antagonists\vampire\powers\tremere\_tremere.dm"
#include "code\modules\antagonists\vampire\powers\tremere\auspex.dm"
#include "code\modules\antagonists\vampire\powers\tremere\dominate.dm"
#include "code\modules\antagonists\vampire\powers\tremere\thaumaturgey.dm"
#include "code\modules\antagonists\vampire\powers\vassal\distress.dm"
#include "code\modules\antagonists\vampire\powers\vassal\recuperate.dm"
#include "code\modules\antagonists\vampire\powers\vassal\revenge_bloodbag.dm"
#include "code\modules\antagonists\vampire\powers\vassal\revenge_checkstatus.dm"
#include "code\modules\antagonists\vampire\powers\vassal\revenge_fold.dm"
#include "code\modules\antagonists\vampire\vassals\datum_vassal.dm"
#include "code\modules\antagonists\vampire\vassals\ex_vassal.dm"
#include "code\modules\antagonists\vampire\vassals\favorite_vassal.dm"
#include "code\modules\antagonists\vampire\vassals\misc_procs_vassal.dm"
#include "code\modules\antagonists\vampire\vassals\revenge_vassal.dm"
#include "code\modules\antagonists\brainwashing\brainwashing.dm"
#include "code\modules\antagonists\brother\brother.dm"
#include "code\modules\antagonists\changeling\cellular_emporium.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
#define FACTION_BLOB "Blob"
#define FACTION_ALIEN "Xenomorph"
#define FACTION_WIZARD "Wizard"
#define FACTION_BLOODSUCKER "Bloodsucker"
#define FACTION_VAMPIRE "Vampire"

// Heretic path defines.
#define HERETIC_PATH_START "Heretic Start Path"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/atom_hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#define ANTAG_HUD_VALENTINE 37
#define ANTAG_HUD_HEARTBREAKER 38
#define ANTAG_HUD_PRISONER 39
#define ANTAG_HUD_BLOODSUCKER 40
#define ANTAG_HUD_VAMPIRE 40

// Notification action types
#define NOTIFY_JUMP "jump"
Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/role_preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#define ROLE_PYRO_SLIME "Pyroclastic Anomaly Slime"
#define ROLE_MONKEY_HELMET "Sentient Monkey"
#define ROLE_PRISONER "Prisoner"
#define ROLE_BLOODSUCKER "Bloodsucker"
#define ROLE_VAMPIRE "Vampire"

/// Roles that are antagonists, roundstart or not, and have passes to do.. antagonistry
GLOBAL_LIST_INIT(antagonist_bannable_roles, list(
Expand Down Expand Up @@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(antagonist_bannable_roles, list(
ROLE_FUGITIVE_HUNTER,
ROLE_SLAUGHTER_DEMON,
ROLE_CONTRACTOR_SUPPORT_UNIT,
ROLE_BLOODSUCKER,
ROLE_VAMPIRE,
))

#define BAN_ROLE_FORCED_ANTAGONISTS "Forced Antagonists"
Expand Down
88 changes: 44 additions & 44 deletions code/__DEFINES/bloodsuckers.dm → code/__DEFINES/vampires.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
///Uncomment this to enable testing of Bloodsucker features (such as vassalizing people with a mind instead of a client).
#define BLOODSUCKER_TESTING
///Uncomment this to enable testing of Vampire features (such as vassalizing people with a mind instead of a client).
#define VAMPIRE_TESTING

/**
* Blood-level defines
*/
/// Determines Bloodsucker regeneration rate
/// Determines Vampire regeneration rate
#define BS_BLOOD_VOLUME_MAX_REGEN 700
/// Cost to torture someone halfway, in blood. Called twice for full cost
#define TORTURE_BLOOD_HALF_COST 8
Expand All @@ -27,15 +27,15 @@

/**
* Cooldown defines
* Used in Cooldowns Bloodsuckers use to prevent spamming
* Used in Cooldowns Vampires use to prevent spamming
*/
///Spam prevention for healing messages.
#define BLOODSUCKER_SPAM_HEALING (15 SECONDS)
#define VAMPIRE_SPAM_HEALING (15 SECONDS)
///Span prevention for Sol Masquerade messages.
#define BLOODSUCKER_SPAM_MASQUERADE (60 SECONDS)
#define VAMPIRE_SPAM_MASQUERADE (60 SECONDS)

///Span prevention for Sol messages.
#define BLOODSUCKER_SPAM_SOL (30 SECONDS)
#define VAMPIRE_SPAM_SOL (30 SECONDS)

/**
* Clan defines
Expand Down Expand Up @@ -68,11 +68,11 @@
/// This Power can't be used while unconscious
#define BP_CANT_USE_WHILE_UNCONSCIOUS (1<<4)

/// This Power can be purchased by Bloodsuckers
#define BLOODSUCKER_CAN_BUY (1<<0)
/// This is a Default Power that all Bloodsuckers get.
#define BLOODSUCKER_DEFAULT_POWER (1<<1)
/// This Power can be purchased by Tremere Bloodsuckers
/// This Power can be purchased by Vampires
#define VAMPIRE_CAN_BUY (1<<0)
/// This is a Default Power that all Vampires get.
#define VAMPIRE_DEFAULT_POWER (1<<1)
/// This Power can be purchased by Tremere Vampires
#define TREMERE_CAN_BUY (1<<2)
/// This Power can be purchased by Vassals
#define VASSAL_CAN_BUY (1<<3)
Expand All @@ -87,40 +87,40 @@
#define BP_AM_COSTLESS_UNCONSCIOUS (1<<3)

/**
* Bloodsucker Signals
* Vampire Signals
*/
///Called when a Bloodsucker ranks up: (datum/bloodsucker_datum, mob/owner, mob/target)
#define BLOODSUCKER_RANK_UP "bloodsucker_rank_up"
///Called when a Bloodsucker interacts with a Vassal on their persuasion rack.
#define BLOODSUCKER_INTERACT_WITH_VASSAL "bloodsucker_interact_with_vassal"
///Called when a Bloodsucker makes a Vassal into their Favorite Vassal: (datum/vassal_datum, mob/master)
#define BLOODSUCKER_MAKE_FAVORITE "bloodsucker_make_favorite"
///Called when a new Vassal is successfully made: (datum/bloodsucker_datum)
#define BLOODSUCKER_MADE_VASSAL "bloodsucker_made_vassal"
///Called when a Bloodsucker exits Torpor.
#define BLOODSUCKER_EXIT_TORPOR "bloodsucker_exit_torpor"
///Called when a Bloodsucker reaches Final Death.
#define BLOODSUCKER_FINAL_DEATH "bloodsucker_final_death"
///Whether the Bloodsucker should not be dusted when arriving Final Death
///Called when a Vampire ranks up: (datum/vampire_datum, mob/owner, mob/target)
#define VAMPIRE_RANK_UP "vampire_rank_up"
///Called when a Vampire interacts with a Vassal on their persuasion rack.
#define VAMPIRE_INTERACT_WITH_VASSAL "vampire_interact_with_vassal"
///Called when a Vampire makes a Vassal into their Favorite Vassal: (datum/vassal_datum, mob/master)
#define VAMPIRE_MAKE_FAVORITE "vampire_make_favorite"
///Called when a new Vassal is successfully made: (datum/vampire_datum)
#define VAMPIRE_MADE_VASSAL "vampire_made_vassal"
///Called when a Vampire exits Torpor.
#define VAMPIRE_EXIT_TORPOR "vampire_exit_torpor"
///Called when a Vampire reaches Final Death.
#define VAMPIRE_FINAL_DEATH "vampire_final_death"
///Whether the Vampire should not be dusted when arriving Final Death
#define DONT_DUST (1<<0)
///Called when a Bloodsucker breaks the Masquerade
#define COMSIG_BLOODSUCKER_BROKE_MASQUERADE "comsig_bloodsucker_broke_masquerade"
///Called when a Bloodsucker enters Frenzy
#define BLOODSUCKER_ENTERS_FRENZY "bloodsucker_enters_frenzy"
///Called when a Bloodsucker exits Frenzy
#define BLOODSUCKER_EXITS_FRENZY "bloodsucker_exits_frenzy"
///Called when a Vampire breaks the Masquerade
#define COMSIG_VAMPIRE_BROKE_MASQUERADE "comsig_vampire_broke_masquerade"
///Called when a Vampire enters Frenzy
#define VAMPIRE_ENTERS_FRENZY "vampire_enters_frenzy"
///Called when a Vampire exits Frenzy
#define VAMPIRE_EXITS_FRENZY "vampire_exits_frenzy"

/**
* Sol signals & Defines
*/
#define COMSIG_SOL_RANKUP_BLOODSUCKERS "comsig_sol_rankup_bloodsuckers"
#define COMSIG_SOL_RANKUP_VAMPIRES "comsig_sol_rankup_vampires"
#define COMSIG_SOL_RISE_TICK "comsig_sol_rise_tick"
#define COMSIG_SOL_NEAR_START "comsig_sol_near_start"
#define COMSIG_SOL_END "comsig_sol_end"
///Sent when a warning for Sol is meant to go out: (danger_level, vampire_warning_message, vassal_warning_message)
#define COMSIG_SOL_WARNING_GIVEN "comsig_sol_warning_given"
///Called on a Bloodsucker's Lifetick.
#define COMSIG_BLOODSUCKER_ON_LIFETICK "comsig_bloodsucker_on_lifetick"
///Called on a Vampire's Lifetick.
#define COMSIG_VAMPIRE_ON_LIFETICK "comsig_vampire_on_lifetick"

#define DANGER_LEVEL_FIRST_WARNING 1
#define DANGER_LEVEL_SECOND_WARNING 2
Expand All @@ -133,12 +133,12 @@
*
* This is stuff that is used solely by Clans for clan-related activity.
*/
///Drinks blood the normal Bloodsucker way.
#define BLOODSUCKER_DRINK_NORMAL "bloodsucker_drink_normal"
///Drinks blood the normal Vampire way.
#define VAMPIRE_DRINK_NORMAL "vampire_drink_normal"
///Drinks blood but is snobby, refusing to drink from mindless
#define BLOODSUCKER_DRINK_SNOBBY "bloodsucker_drink_snobby"
#define VAMPIRE_DRINK_SNOBBY "vampire_drink_snobby"
///Drinks blood from disgusting creatures without Humanity consequences.
#define BLOODSUCKER_DRINK_INHUMANELY "bloodsucker_drink_imhumanely"
#define VAMPIRE_DRINK_INHUMANELY "vampire_drink_imhumanely"

/**
* Traits
Expand All @@ -151,25 +151,25 @@
/**
* Sources
*/
#define TRAIT_BLOODSUCKER "trait_bloodsucker"
#define TRAIT_VAMPIRE "trait_vampire"
/// Source trait while Feeding
#define TRAIT_FEED "trait_feed"
/// Source trait during a Frenzy
#define TRAIT_FRENZY "trait_frenzy"
/// Source trait for bloodsuckers in torpor.
/// Source trait for vampires in torpor.
#define TRAIT_TORPOR "trait_torpor"
/// Source trait for bloodsucker mesmerization.
/// Source trait for vampire mesmerization.
#define TRAIT_MESMERIZED "trait_mesmerized"

/**
* Macros
*/
#define IS_BLOODSUCKER(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/bloodsucker))
#define IS_VAMPIRE(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vampire))
#define IS_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal))
#define IS_FAVORITE_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal/favorite))
#define IS_REVENGE_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/vassal/revenge))
#define IS_EX_VASSAL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/ex_vassal))
#define IS_CURATOR(mob) (mob?.mind?.assigned_role == JOB_NAME_CURATOR)

//Used in bloodsucker_life.dm
//Used in vampire_life.dm
#define MARTIALART_FRENZYGRAB "frenzy grabbing"
6 changes: 3 additions & 3 deletions code/_onclick/hud/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/atom/movable/screen/ling/chems/lingchemdisplay
var/atom/movable/screen/ling/sting/lingstingdisplay

var/atom/movable/screen/bloodsucker/blood_counter/blood_display
var/atom/movable/screen/bloodsucker/rank_counter/vamprank_display
var/atom/movable/screen/bloodsucker/sunlight_counter/sunlight_display
var/atom/movable/screen/vampire/blood_counter/blood_display
var/atom/movable/screen/vampire/rank_counter/vamprank_display
var/atom/movable/screen/vampire/sunlight_counter/sunlight_display

var/atom/movable/screen/blobpwrdisplay

Expand Down
Loading

0 comments on commit 0d817b4

Please sign in to comment.