cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes and paincrit balances

Browse Source
This commit is contained in:
ZomgPonies
2013-10-31 04:07:57 -04:00
parent b2b3faebc0
commit 81d393d20b
4 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+22 -10
View File
@@ -1278,6 +1278,7 @@
else
see_invisible = SEE_INVISIBLE_LIVING
else if(!seer)
see_in_dark = species.darksight
see_invisible = SEE_INVISIBLE_LIVING
if(healths)
@@ -1478,7 +1479,7 @@
if(traumatic_shock >= 80)
shock_stage += 1
else
shock_stage = min(shock_stage, 100)
shock_stage = min(shock_stage, 160)
shock_stage = max(shock_stage-1, 0)
return
@@ -1493,17 +1494,28 @@
if(shock_stage == 40)
src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
if (shock_stage >= 60)
if(shock_stage == 60) emote("me",1,"'s body becomes limp.")
if (prob(5) && health <= 20)
Stun(20)
lying = 1
if(shock_stage >=60)
if (prob(2))
src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
Weaken(20)
if(shock_stage == 80)
src << "<font color='red'><b>"+pick("You see a light at the end of the tunnel!", "You feel like you could die any moment now.", "You're about to lose consciousness.")
if(shock_stage >= 80)
if (prob(5))
src << "<font color='red'><b>"+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
Weaken(20)
if(shock_stage >= 120)
if (prob(2))
src << "<font color='red'><b>"+pick("You black out!", "You feel like you could die any moment now.", "You're about to lose consciousness.")
Paralyse(5)
if(shock_stage == 150)
emote("me",1,"can no longer stand, collapsing!")
Weaken(20)
if(shock_stage >= 150)
Weaken(20)
if (shock_stage > 100 && health <= 20)
Paralyse(rand(15,28))
proc/handle_pulse()
if(life_tick % 5) return pulse //update pulse every 5 life ticks (~1 tick/sec, depending on server load)
code/modules/mob/living/carbon/shock.dm
+6 -6
View File
@@ -5,11 +5,11 @@
/mob/living/carbon/proc/updateshock()
src.traumatic_shock = \
1 * src.getOxyLoss() + \
0.5 * src.getToxLoss() + \
2.5 * src.getFireLoss() + \
1.5 * src.getBruteLoss() + \
2 * src.getCloneLoss() + \
1 * src.halloss
0.7 * src.getToxLoss() + \
1.5 * src.getFireLoss() + \
1.2 * src.getBruteLoss() + \
1.7 * src.getCloneLoss() + \
2 * src.halloss
if(reagents.has_reagent("alkysine"))
src.traumatic_shock -= 10
@@ -35,7 +35,7 @@
else if(organ.status & ORGAN_BROKEN || organ.open)
src.traumatic_shock += 30
if(organ.status & ORGAN_SPLINTED)
src.traumatic_shock -= 20
src.traumatic_shock -= 25
if(src.traumatic_shock < 0)
src.traumatic_shock = 0