From e1c8ee5cd824beb02d54c97a63e824919015eaaa Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Tue, 1 Dec 2020 19:02:32 -0300
Subject: [PATCH 1/6] Update traits.dm
---
code/__DEFINES/traits.dm | 1 -
1 file changed, 1 deletion(-)
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.
From 1034c6add0ebff5c592e12362e6bd50073e4fef5 Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Tue, 1 Dec 2020 20:05:48 -0300
Subject: [PATCH 2/6] one punch man
---
code/modules/antagonists/bloodsucker/datum_bloodsucker.dm | 4 ++--
code/modules/antagonists/bloodsucker/powers/bs_brawn.dm | 2 +-
tgstation.dme | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
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/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"
From cd956cae3ac6c88d3dcd6f2e7cd2a00fddbf01a4 Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Tue, 1 Dec 2020 20:07:26 -0300
Subject: [PATCH 3/6] dynamic moment
---
code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index afd1830f..1d79de3b 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -846,7 +846,7 @@
cost = 10
requirements = list(101,101,50,40,40,30,30,30,20,20)
high_population_requirement = 10
- chaos_min = 2.9
+ chaos_min = 3.5
chaos_max = 4.9
/datum/dynamic_ruleset/roundstart/bloodsucker/pre_execute()
From d9c23dafb8c4daea1b777fa5c9edb89ff89c3af1 Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Tue, 1 Dec 2020 20:47:27 -0300
Subject: [PATCH 4/6] Update bloodsucker_crypt.dm
---
.../antagonists/bloodsucker/objects/bloodsucker_crypt.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
index 2a5af01a..48e5df0a 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)
From 8c56e05f91b35b58215b7cbfe10e1ea529e51299 Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Tue, 1 Dec 2020 22:29:20 -0300
Subject: [PATCH 5/6] Update status_effects.dm
---
code/__DEFINES/status_effects.dm | 1 -
1 file changed, 1 deletion(-)
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
From e9adea5d9f6589e4b283ea128c98ea73b55c0746 Mon Sep 17 00:00:00 2001
From: CygnusB <39594514+MalricB@users.noreply.github.com>
Date: Tue, 1 Dec 2020 23:25:37 -0300
Subject: [PATCH 6/6] bsuckers get their objectives and also limits thrallling
to 1 per 10 levels
---
code/datums/mind.dm | 28 ++++++++++---------
.../bloodsucker/objects/bloodsucker_crypt.dm | 2 +-
2 files changed, 16 insertions(+), 14 deletions(-)
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 += ""
- for(var/datum/mind/M in other_owners)
- output += "- Conspirator: [M.name]
"
- 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 += ""
+ for(var/datum/mind/M in other_owners)
+ output += "- Conspirator: [M.name]
"
+ output += "
"
if(window)
recipient << browse(output,"window=memory")
diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
index 48e5df0a..84c09295 100644
--- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
+++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm
@@ -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...