From 14d749bd76c62792ef4bdf9d18703a7a9f3912ba Mon Sep 17 00:00:00 2001 From: Artur Date: Sun, 2 Feb 2020 16:23:26 +0100 Subject: [PATCH] Weh --- code/modules/antagonists/bloodsucker/bloodsucker_life.dm | 2 +- code/modules/antagonists/bloodsucker/datum_bloodsucker.dm | 8 ++++---- .../antagonists/bloodsucker/objects/bloodsucker_coffin.dm | 8 +++++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm index 638b18cc7f..0179c60ef1 100644 --- a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm +++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm @@ -84,7 +84,7 @@ //It is called from your coffin on close (by you only) if(poweron_masquerade == TRUE || owner.current.AmStaked()) return FALSE - owner.current.adjustStaminaLoss(-1.5 + (regenRate * -6) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more. + owner.current.adjustStaminaLoss(-1.5 + (regenRate * -7) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more. owner.current.adjustCloneLoss(-0.1 * (regenRate * 2) * mult, 0) owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * (regenRate * 4) * mult) //adjustBrainLoss(-1 * (regenRate * 4) * mult, 0) // No Bleeding diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm index 296137a608..24e967f00b 100644 --- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm +++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm @@ -21,8 +21,8 @@ var/poweron_masquerade = FALSE // STATS var/vamplevel = 0 - var/vamplevel_unspent = 0 - var/regenRate = 0.3 // How many points of Brute do I heal per tick? + var/vamplevel_unspent = 1 + var/regenRate = 0.4 // How many points of Brute do I heal per tick? var/feedAmount = 15 // Amount of blood drawn from a target per tick. var/maxBloodVolume = 600 // Maximum blood a Vamp can hold via feeding. // BLOOD_VOLUME_NORMAL 550 // BLOOD_VOLUME_SAFE 475 //BLOOD_VOLUME_OKAY 336 //BLOOD_VOLUME_BAD 224 // BLOOD_VOLUME_SURVIVE 122 // OBJECTIVES @@ -203,7 +203,7 @@ // Make Changes H.physiology.brute_mod *= 0.8 // <-------------------- Start small, but burn mod increases based on rank! H.physiology.cold_mod = 0 - H.physiology.stun_mod *= 0.6 + H.physiology.stun_mod *= 0.5 H.physiology.siemens_coeff *= 0.75 //base electrocution coefficient 1 //S.heatmod += 0.5 // Heat shouldn't affect. Only Fire. //S.punchstunthreshold = 8 //damage at which punches from this race will stun 9 @@ -284,7 +284,7 @@ if(vamplevel_unspent <= 0 || !owner || !owner.current || !owner.current.client || !isliving(owner.current)) return var/mob/living/L = owner.current - level_bloodcost = maxBloodVolume * 0.3 + level_bloodcost = maxBloodVolume * 0.2 //If the blood volume of the bloodsucker is lower than the cost to level up, return and inform the bloodsucker //TODO: Make this into a radial, or perhaps a tgui next UI diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm index 946c472f11..a25244c48d 100644 --- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm @@ -60,6 +60,8 @@ breakout_time = 600 pryLidTimer = 400 resistance_flags = NONE + integrity_failure = 70 + armor = list("melee" = 50, "bullet" = 20, "laser" = 30, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60) /obj/structure/closet/crate/coffin/meatcoffin name = "meat coffin" @@ -75,7 +77,9 @@ resistance_flags = NONE material_drop = /obj/item/reagent_containers/food/snacks/meat/slab material_drop_amount = 3 - + integrity_failure = 40 + armor = list("melee" = 70, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100) + /obj/structure/closet/crate/coffin/metalcoffin name = "metal coffin" desc = "A big metal sardine can inside of another big metal sardine can, in space." @@ -90,6 +94,8 @@ resistance_flags = NONE material_drop = /obj/item/stack/sheet/metal material_drop_amount = 5 + integrity_failure = 60 + armor = list("melee" = 40, "bullet" = 15, "laser" = 50, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60) //////////////////////////////////////////////