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

Stamina Damage Rework (#12591)

Browse Source
This commit is contained in:
Fox McCloud
2019-10-27 00:23:22 -04:00
committed by variableundefined
parent 573d390d93
commit 00f5e0613c
39 changed files with 91 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/holder.dm
-1
View File
@@ -314,7 +314,6 @@ var/const/INGEST = 2
if(update_flags & STATUS_UPDATE_CANMOVE)
M.update_canmove()
if(update_flags & STATUS_UPDATE_STAMINA)
M.handle_hud_icons_health()
M.update_stamina()
if(update_flags & STATUS_UPDATE_BLIND)
M.update_blind_effects()
code/modules/reagents/chemistry/reagents/blob.dm
+2 -2
View File
@@ -25,7 +25,7 @@
if(method == TOUCH)
volume = ..()
M.apply_damage(0.6*volume, BRUTE)
M.adjustStaminaLoss(0.4*volume)
M.adjustStaminaLoss(volume)
if(iscarbon(M))
M.emote("scream")
@@ -105,7 +105,7 @@
if(method == TOUCH)
volume = ..()
M.apply_damage(0.4*volume, BURN)
M.adjustStaminaLoss(0.4*volume)
M.adjustStaminaLoss(volume)
if(M.reagents)
M.reagents.add_reagent("frostoil", 0.4*volume)