Many brainmed changes. (#7967)

This commit is contained in:
Matt Atlas
2020-01-12 16:44:26 +01:00
committed by GitHub
parent 86790e2377
commit 1567673e9a
17 changed files with 122 additions and 71 deletions

View File

@@ -233,7 +233,7 @@
user.visible_message("<b>[user]</b> checks [src]'s pulse.", "You check [src]'s pulse.")
if (do_mob(user, src, 15))
if(pulse() == PULSE_NONE)
to_chat(user, "<span class='deadsay'>[T.He] [T.has] no pulse...</span>")
to_chat(user, "<span class='deadsay'>[T.He] [T.has] no pulse.</span>")
else
to_chat(user, "<span class='deadsay'>[T.He] [T.has] a pulse!</span>")

View File

@@ -1317,7 +1317,7 @@
"<span class='warning'>Your movement jostles [O] in your [organ.name] painfully.</span>")
to_chat(src, msg)
adjustHalLoss(rand(1, 3))
organ.take_damage(rand(1, 3), sharp = TRUE, edge = TRUE, used_weapon = O)
/mob/living/carbon/human/verb/check_pulse()
set category = "Object"

View File

@@ -1120,7 +1120,8 @@
custom_pain("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!", 40, nohalloss = TRUE)
if (shock_stage >= 60)
if(shock_stage == 60) emote("me",1,"'s body becomes limp.")
if(shock_stage == 60)
visible_message("[src]'s body becomes limp.", "Your body becomes limp.")
if (prob(2))
custom_pain("[pick("The pain is excruciating", "Please, just end the pain", "Your whole body is going numb")]!", shock_stage, nohalloss = TRUE)
Weaken(20)
@@ -1403,4 +1404,3 @@
damageoverlay.cut_overlay(last_oxy_overlay)
last_oxy_overlay = null

View File

@@ -9,7 +9,7 @@
deform = 'icons/mob/human_races/r_skeleton.dmi'
eyes = "blank_eyes"
total_health = 85 //gotta get headshots to kill them, so they're frail
total_health = 70 //gotta get headshots to kill them, so they're frail
default_language = "Ceti Basic"
language = "Cult"

View File

@@ -48,7 +48,7 @@
if(istype(M, /mob/living/carbon))
Victim.adjustCloneLoss(rand(5,6))
Victim.adjustToxLoss(rand(1,2))
Victim.adjustToxLoss(rand(2,3))
if(Victim.health <= 0)
Victim.adjustToxLoss(rand(2,4))
@@ -64,7 +64,7 @@
var/painMes = pick("You can feel your body becoming weak!", "You feel like you're about to die!", "You feel every part of your body screaming in agony!", "A low, rolling pain passes through your body!", "Your body feels as if it's falling apart!", "You feel extremely weak!", "A sharp, deep pain bathes every inch of your body!")
if (ishuman(M))
var/mob/living/carbon/human/H = M
H.custom_pain(painMes)
H.custom_pain(painMes, 100)
else if (istype(M, /mob/living/carbon))
var/mob/living/carbon/C = M
if (!(C.species && (C.species.flags & NO_PAIN)))

View File

@@ -178,7 +178,7 @@ default behaviour is:
/mob/living/verb/succumb()
set hidden = 1
if (health < maxHealth/2)
if (health < maxHealth / 3)
adjustBrainLoss(health + maxHealth * 2) // Deal 2x health in BrainLoss damage, as before but variable.
to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
else

View File

@@ -214,7 +214,7 @@ proc/getsensorlevel(A)
//The base miss chance for the different defence zones
var/list/global/base_miss_chance = list(
BP_HEAD = 85,
BP_HEAD = 70,
BP_CHEST = 10,
BP_GROIN = 20,
BP_L_LEG = 20,