cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-28 11:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG: HUD damage indicator now updates with halloss

Browse Source 
Inspecting yourself for organ damage now randomly shows damaged organs if you
have halloss
Mining shuttle now shunts people where it wants to be
Shuttles now crush people if they fail to move out of where they want to be with
the initial shunt.
Revision: r3337
Author: 	 VivianFoxfoot
This commit is contained in:
Ren Erthilo
2012-04-29 22:45:02 +01:00
parent 2b96fec3f1
commit 18207f18d0
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/carbon/carbon.dm
View File

@@ -193,11 +193,13 @@
var/status = ""
var/brutedamage = org.brute_dam
var/burndamage = org.burn_dam
if(halloss > 0)
if(prob(30))
brutedamage += halloss
if(prob(30))
burndamage += halloss
if(brutedamage > 0)
status = "bruised"
if(brutedamage > 20)
@@ -208,6 +210,7 @@
status += " and "
if(burndamage > 40)
status += "peeling away"
else if(burndamage > 10)
status += "blistered"
else if(burndamage > 0)