Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 9ec69ea

Browse files
committed
more
1 parent 49acef8 commit 9ec69ea

File tree

6 files changed

+19
-277
lines changed

6 files changed

+19
-277
lines changed

code/datums/mutations/olfaction.dm

Lines changed: 0 additions & 184 deletions
This file was deleted.

code/modules/antagonists/bloodsuckers/bloodsucker_frenzy.dm

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
2-
/**
3-
* # FrenzyGrab
4-
*
5-
* The martial art given to Bloodsuckers so they can instantly aggressively grab people.
6-
*/
7-
/datum/martial_art/frenzygrab
8-
name = "Frenzy Grab"
9-
id = MARTIALART_FRENZYGRAB
10-
11-
/datum/martial_art/frenzygrab/grab_act(mob/living/user, mob/living/target)
12-
if(user != target)
13-
target.grabbedby(user)
14-
target.grippedby(user, instant = TRUE)
15-
return TRUE
16-
return ..()
17-
181
/**
192
* # Status effect
203
*
@@ -49,7 +32,6 @@
4932
return FALSE
5033

5134
// Disable ALL Powers and notify their entry
52-
bloodsuckerdatum.DisableAllPowers(forced = TRUE)
5335
to_chat(owner, span_userdanger("<FONT size = 3>Blood! You need Blood, now! You enter a total Frenzy! Your skin starts sizzling...."))
5436
to_chat(owner, span_announce("* Bloodsucker Tip: While in Frenzy, you instantly Aggresively grab, have stun resistance, and cannot speak, hear, or use any powers outside of Feed and Trespass (If you have it)."))
5537
owner.balloon_alert(owner, "you enter a frenzy!")

code/modules/antagonists/bloodsuckers/bloodsucker_integration.dm

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,19 @@
1-
21
/*
32
* OVERWRITES
43
*/
5-
6-
/datum/species/jelly/slime/spec_life(mob/living/carbon/human/user)
7-
// Prevents Slimeperson 'gaming
8-
if(IS_BLOODSUCKER(user))
9-
return
10-
. = ..()
11-
12-
// Used when analyzing a Bloodsucker, Masquerade will hide brain traumas
13-
/mob/living/carbon/get_traumas()
14-
if(!mind)
15-
return ..()
16-
var/datum/antagonist/bloodsucker/bloodsuckerdatum = IS_BLOODSUCKER(src)
17-
if(bloodsuckerdatum && HAS_TRAIT(src, TRAIT_MASQUERADE))
18-
return
19-
. = ..()
20-
214
// Used to keep track of how much Blood we've drank so far
225
/mob/living/get_status_tab_items()
236
. = ..()
247
if(mind)
258
var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(/datum/antagonist/bloodsucker)
269
if(bloodsuckerdatum)
2710
. += ""
28-
. += "Current Frenzy Enter: [FRENZY_THRESHOLD_ENTER + bloodsuckerdatum.humanity_lost * 10]"
29-
. += "Current Frenzy Leave: [FRENZY_THRESHOLD_EXIT + bloodsuckerdatum.humanity_lost * 10]"
11+
. += "Current Frenzy Enter: [FRENZY_THRESHOLD_ENTER]"
12+
. += "Current Frenzy Leave: [FRENZY_THRESHOLD_EXIT]"
3013
. += "Blood Drank: [bloodsuckerdatum.total_blood_drank]"
3114
if(bloodsuckerdatum.has_task)
3215
. += "Task Blood Drank: [bloodsuckerdatum.task_blood_drank]"
3316

34-
// INTEGRATION: Adding Procs and Datums to existing "classes" //
35-
36-
/mob/living/proc/HaveBloodsuckerBodyparts(displaymessage = "") // displaymessage can be something such as "rising from death" for Torpid Sleep. givewarningto is the person receiving messages.
37-
if(!getorganslot(ORGAN_SLOT_HEART))
38-
if(displaymessage != "")
39-
to_chat(src, span_warning("Without a heart, you are incapable of [displaymessage]."))
40-
return FALSE
41-
if(!get_bodypart(BODY_ZONE_HEAD))
42-
if(displaymessage != "")
43-
to_chat(src, span_warning("Without a head, you are incapable of [displaymessage]."))
44-
return FALSE
45-
if(!getorgan(/obj/item/organ/brain)) // NOTE: This is mostly just here so we can do one scan for all needed parts when creating a vamp. You probably won't be trying to use powers w/out a brain.
46-
if(displaymessage != "")
47-
to_chat(src, span_warning("Without a brain, you are incapable of [displaymessage]."))
48-
return FALSE
49-
return TRUE
50-
5117
// EXAMINING
5218
/mob/living/carbon/proc/return_vamp_examine(mob/living/viewer)
5319
if(!mind || !viewer.mind)
@@ -64,7 +30,7 @@
6430
return returnIcon + returnString
6531
// Viewer not a Vamp AND not the target's vassal?
6632
if(!viewer.mind.has_antag_datum((/datum/antagonist/bloodsucker)) && !(viewer in bloodsuckerdatum.vassals))
67-
if(!(HAS_TRAIT(viewer, TRAIT_BLOODSUCKER_HUNTER) && bloodsuckerdatum.broke_masquerade))
33+
if(!HAS_TRAIT(viewer, TRAIT_BLOODSUCKER_HUNTER))
6834
return ""
6935
// Default String
7036
var/returnString = "\[<span class='warning'><EM>[bloodsuckerdatum.return_full_name(1)]</EM></span>\]"
@@ -95,7 +61,7 @@
9561
returnIcon = "[icon2html('icons/mob/vampiric.dmi', world, "vassal")]"
9662
// Am I someone ELSE'S Vassal?
9763
else if(IS_BLOODSUCKER(viewer) || IS_MONSTERHUNTER(viewer))
98-
returnString += "This [dna.species.name] bears the mark of <span class='boldwarning'>[vassaldatum.master.return_full_name(vassaldatum.master.owner.current,TRUE)][vassaldatum.master.broke_masquerade ? " who has broken the Masquerade" : ""]</span>"
64+
returnString += "This [dna.species.name] bears the mark of <span class='boldwarning'>[vassaldatum.master.return_full_name(vassaldatum.master.owner.current,TRUE)]</span>"
9965
returnIcon = "[icon2html('icons/mob/vampiric.dmi', world, "vassal_grey")]"
10066
// Are you serving the same master as I am?
10167
else if(viewer.mind.has_antag_datum(/datum/antagonist/vassal) in vassaldatum?.master.vassals)

code/modules/antagonists/bloodsuckers/bloodsuckers.dm

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,14 @@
2525
///Used for assigning your reputation
2626
var/bloodsucker_reputation
2727

28-
///Amount of Humanity lost
29-
var/humanity_lost = 0
3028
///If we are currently in a Frenzy
3129
var/frenzied = FALSE
3230
///If we have a task assigned
3331
var/has_task = FALSE
3432
///How many times have we used a blood altar
3533
var/altar_uses = 0
3634

37-
///Frenzy Grab Martial art given to Bloodsuckers in a Frenzy
38-
var/datum/martial_art/frenzygrab/frenzygrab = new
35+
// give TRAIT_STRONG_GRABBER during frenzy
3936
///How many clan points you have -> Used in clans in order to assert certain limits // Upgrades and stuff
4037
var/clanpoints = 0
4138
///How much progress have you done on your clan
@@ -46,7 +43,7 @@
4643
///Special vassals I own, to not have double of the same type.
4744
var/list/datum/antagonist/vassal/special_vassals = list()
4845

49-
var/bloodsucker_level
46+
var/bloodsucker_level = 1
5047
var/bloodsucker_level_unspent = 1
5148
var/passive_blood_drain = -0.1
5249
var/additional_regen
@@ -77,7 +74,8 @@
7774
/// Antagonists that cannot be Vassalized no matter what
7875
var/static/list/vassal_banned_antags = list(
7976
/datum/antagonist/bloodsucker,
80-
/datum/antagonist/monsterhunter,
77+
/datum/antagonist/darkspawn,
78+
/datum/antagonist/monsterhunter
8179
)
8280
///Default Bloodsucker traits
8381
var/static/list/bloodsucker_traits = list(
@@ -126,10 +124,7 @@
126124
// Objectives
127125
forge_bloodsucker_objectives()
128126

129-
. = ..()
130-
// Assign Powers
131-
give_starting_powers()
132-
assign_starting_stats()
127+
return ..()
133128

134129
/**
135130
* Apply innate effects is everything given to the mob
@@ -237,7 +232,7 @@
237232
return FALSE
238233
return bloodsucker_blood_volume >= amt
239234

240-
/datum/antagonist/bloodsucker/proc/use_psi(datum/mind, list/resource_costs)
235+
/datum/antagonist/bloodsucker/proc/use_blood(datum/mind, list/resource_costs)
241236
SIGNAL_HANDLER
242237
if(!LAZYLEN(resource_costs))
243238
return
@@ -364,9 +359,9 @@
364359
return
365360

366361
/datum/antagonist/bloodsucker/ui_assets(mob/user)
367-
return list(
368-
get_asset_datum(/datum/asset/simple/bloodsucker_icons),
369-
)
362+
// return list(
363+
// get_asset_datum(/datum/asset/simple/bloodsucker_icons),
364+
// )
370365

371366
////////////////////////////////////////////////////////////////////////////////////
372367
//------------------------------Roundend report-----------------------------------//
@@ -440,23 +435,23 @@
440435
// if(broke_masquerade)
441436
// if(escaped)
442437
// flavor_message += pick(list(
443-
// "What matters of the Masquerade to you? Let it crumble into dust as your tyranny whips forward to dine on more stations. \
438+
// "What matters of the Masquerade to you? Let it crumble into dust as your tyranny whips forward to dine on more stations.
444439
// News of your butchering exploits will quickly spread, and you know what will encompass the minds of mortals and undead alike. Fear."
445440
// ))
446441
// else if(alive)
447442
// flavor_message += pick(list(
448-
// "Blood still pumps in your veins as you lay stranded on the station. No doubt the wake of chaos left in your path will attract danger, but greater power than you've ever felt courses through your body. \
443+
// "Blood still pumps in your veins as you lay stranded on the station. No doubt the wake of chaos left in your path will attract danger, but greater power than you've ever felt courses through your body.
449444
// Let the Camarilla and the witchers come. You will be waiting."
450445
// ))
451446
// else
452447
// if(escaped)
453448
// flavor_message += pick(list(
454-
// "You step off the spacecraft with a mark of pride at a superbly completed mission. Upon arriving back at CentCom, an unassuming assistant palms you an invitation stamped with the Camarilla seal. \
449+
// "You step off the spacecraft with a mark of pride at a superbly completed mission. Upon arriving back at CentCom, an unassuming assistant palms you an invitation stamped with the Camarilla seal.
455450
// High society awaits: a delicacy you have earned."
456451
// ))
457452
// else if(alive)
458453
// flavor_message += pick(list(
459-
// "This station has become your own slice of paradise. Your mission completed, you turn on the others who were stranded, ripe for your purposes. \
454+
// "This station has become your own slice of paradise. Your mission completed, you turn on the others who were stranded, ripe for your purposes.
460455
// Who knows? If they prove to elevate your power enough, perhaps a new bloodline might be founded here."
461456
// ))
462457
// else

0 commit comments

Comments
 (0)