cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-07 07:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some organ based bugginess.

Browse Source
This commit is contained in:
SkyMarshal
2012-04-11 12:56:52 -07:00
parent f0490787ef
commit d388f8f26f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/examine.dm
View File

@@ -484,7 +484,7 @@
// usr << "\red [src.name] is bleeding from a [sizetext] on [t_his] [temp.display_name]."
// continue
msg += "[print_flavor_text()]\n"
if(print_flavor_text()) msg += "[print_flavor_text()]\n"
msg += "\blue *---------*"
usr << msg

12
code/modules/mob/organ/organ.dm
View File

@@ -130,7 +130,7 @@
burn_dam += burn
createwound(max(1,min(6,round(burn/10) + rand(0,1))),2,burn)
else
var/passed_dam = (brute_dam + burn_dam) - can_inflict //Getting how much overdamage we have.
var/passed_dam = (brute + burn) - can_inflict //Getting how much overdamage we have.
var/list/datum/organ/external/possible_points = list()
if(parent)
possible_points += parent
@@ -167,7 +167,7 @@
else if(W.damage)
brute_to_heal += W.damage
brute_wounds += W
if(brute && brute >= brute_to_heal)
if(brute && brute <= brute_to_heal)
for(var/datum/organ/wound/W in brute_wounds)
if(brute >= W.damage)
brute_dam -= W.damage
@@ -185,7 +185,7 @@
W.initial_dmg = 0
W.stopbleeding(1)
brute_dam = 0
if(burn && burn >= burn_to_heal)
if(burn && burn <= burn_to_heal)
for(var/datum/organ/wound/W in burn_wounds)
if(burn >= W.damage)
burn_dam -= W.damage
@@ -402,12 +402,12 @@
wounds += W
else
var/datum/organ/wound/W = pick(possible_wounds)
bleeding = !type //Sharp objects cause bleeding.
W.bleeding = !type
bleeding = max(!type,bleeding) //Sharp objects cause bleeding.
W.bleeding = max(!type,W.bleeding)
// owner:bloodloss += 10 * size
W.damage += damage
W.initial_dmg += damage
W.wound_size = max(1,min(6,round(damage/10) + rand(0,1)))
W.wound_size = max(1,min(6,round(W.damage/10) + rand(0,1)))
/datum/organ/wound
name = "wound"