diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 8f3a316f..664ebf8b 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -44,7 +44,6 @@ #define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping //the affected is asleep -#define STATUS_EFFECT_TASED /datum/status_effect/electrode //the affected has been tased, preventing fine muscle control #define STATUS_EFFECT_TASED /datum/status_effect/no_combat_mode/electrode/ //the affected has been tased, preventing fine muscle control #define STATUS_EFFECT_PACIFY /datum/status_effect/pacify //the affected is pacified, preventing direct hostile actions diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index fec5cead..69eaa46d 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -126,7 +126,6 @@ #define TRAIT_RADRESONANCE "radioactive_resonance" //Hyperstation edit #define TRAIT_SWIMMING "swimming" //only applied by /datum/element/swimming, for checking #define TRAIT_CAPTAIN_METABOLISM "captain-metabolism" -#define TRAIT_COLDBLOODED "coldblooded" // Your body is literal room temperature. Does not make you immune to the temp. #define TRAIT_NONATURALHEAL "nonaturalheal" // Only Admins can heal you. NOTHING else does it unless it's given the god tag. #define TRAIT_NORUNNING "norunning" // You walk! #define TRAIT_NOMARROW "nomarrow" // You don't make blood, with chemicals or nanites. diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f8550697..db2b099e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -364,20 +364,22 @@ output += memory - for(var/datum/antagonist/A in antag_datums) - output += A.antag_memory + var/list/all_objectives = list() + for(var/datum/antagonist/A in antag_datums) + output += A.antag_memory + all_objectives |= A.objectives - if(objectives.len) - output += "Objectives:" - var/obj_count = 1 - for(var/datum/objective/objective in objectives) - output += "
Objective #[obj_count++]: [objective.explanation_text]" - var/list/datum/mind/other_owners = objective.get_owners() - src - if(other_owners.len) - output += "" + if(all_objectives.len) + output += "Objectives:" + var/obj_count = 1 + for(var/datum/objective/objective in all_objectives) + output += "
Objective #[obj_count++]: [objective.explanation_text]" + var/list/datum/mind/other_owners = objective.get_owners() - src + if(other_owners.len) + output += "" if(window) recipient << browse(output,"window=memory") diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index ace86b80..13fced16 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -321,8 +321,8 @@ datum/antagonist/bloodsucker/proc/SpendRank() var/datum/species/S = H.dna.species S.burnmod *= 0.025 // Slightly more burn damage S.stunmod *= 0.95 // Slightly less stun time. - S.punchdamagelow += 0.5 - S.punchdamagehigh += 0.5 // NOTE: This affects the hitting power of Brawn. + S.punchdamagelow += 0.75 + S.punchdamagehigh += 0.75 // NOTE: This affects the hitting power of Brawn. // More Health owner.current.setMaxHealth(owner.current.maxHealth + 5) // Vamp Stats diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm index 2a5af01a..84c09295 100644 --- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm @@ -101,7 +101,7 @@ var/convert_progress = 3 // Resets on each new character to be added to the chair. Some effects should lower it... var/disloyalty_confirm = FALSE // Command & Antags need to CONFIRM they are willing to lose their role (and will only do it if the Vassal'ing succeeds) var/disloyalty_offered = FALSE // Has the popup been issued? Don't spam them. - var/convert_cost = 100 + var/convert_cost = 375 /obj/structure/bloodsucker/vassalrack/deconstruct(disassembled = TRUE) new /obj/item/stack/sheet/metal(src.loc, 4) @@ -255,7 +255,7 @@ if(user.blood_volume < convert_cost + 5) to_chat(user, "You don't have enough blood to initiate the Dark Communion with [target].") return - if(bloodsuckerdatum.count_vassals(user)*5 > bloodsuckerdatum.vamplevel) + if(!bloodsuckerdatum || bloodsuckerdatum.vassals.len * 10 > bloodsuckerdatum.vamplevel) to_chat(user, "Your power is yet too weak to bring more vassals under your control....") return // Prep... diff --git a/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm b/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm index 49aada36..5a40e556 100644 --- a/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm +++ b/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm @@ -66,7 +66,7 @@ // Target Type: Mob if(isliving(target)) var/mob/living/carbon/user_C = user - var/hitStrength = user_C.dna.species.punchdamagehigh * 1.3 + 5 + var/hitStrength = user_C.dna.species.punchdamagehigh * 2.0 + 5 // Knockdown! var/powerlevel = min(5, 1 + level_current) if(rand(5 + powerlevel) >= 5) diff --git a/tgstation.dme b/tgstation.dme index 9d8a5f4f..705ac989 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1241,6 +1241,7 @@ #include "code\modules\antagonists\bloodsucker\objects\bloodsucker_coffin.dm" #include "code\modules\antagonists\bloodsucker\objects\bloodsucker_crypt.dm" #include "code\modules\antagonists\bloodsucker\objects\bloodsucker_lair.dm" +#include "code\modules\antagonists\bloodsucker\powers\bs_brawn.dm" #include "code\modules\antagonists\bloodsucker\powers\bs_cloak.dm" #include "code\modules\antagonists\bloodsucker\powers\bs_feed.dm" #include "code\modules\antagonists\bloodsucker\powers\bs_fortitude.dm"