cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Zuhayr
2013-08-03 12:39:51 -07:00
parent 18eb59cf73 b6f9fbbf09
commit 49d53c376b
170 changed files with 4533 additions and 3153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/organs/blood.dm
View File

@@ -163,8 +163,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
//set reagent data
B.data["donor"] = src
if(src.virus2)
B.data["virus2"] = src.virus2.getcopy()
if (!B.data["virus2"])
B.data["virus2"] = list()
B.data["virus2"] |= virus_copylist(src.virus2)
B.data["antibodies"] = src.antibodies
B.data["blood_DNA"] = copytext(src.dna.unique_enzymes,1,0)
if(src.resistances && src.resistances.len)
@@ -200,7 +201,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
else
vessel.add_reagent("blood", amount, injected.data)
vessel.update_total()
src.virus2 |= virus_copylist(injected.data["virus2"])
if (injected.data["antibodies"] && prob(5))
antibodies |= injected.data["antibodies"]
var/list/chems = list()
chems = params2list(injected.data["trace_chem"])
for(var/C in chems)

4
code/modules/organs/organ.dm
View File

@@ -80,7 +80,7 @@
//Broken limbs hurt too
var/broken = 0
if(E.status & ORGAN_BROKEN && !(E.status & ORGAN_SPLINTED && prob(10)) )
if(E.status & ORGAN_BROKEN && !(E.status & ORGAN_SPLINTED) )
broken = 1
//Moving around with fractured ribs won't do you any good
@@ -114,7 +114,7 @@
del(spark_system)
else if(E.name in list("l_leg","l_foot","r_leg","r_foot") && !lying)
if (E.status & ORGAN_DESTROYED || malfunction || (broken && !(E.status & ORGAN_SPLINTED)))
if (!E.is_usable() || malfunction || (broken && !(E.status & ORGAN_SPLINTED)))
leg_tally-- // let it fail even if just foot&leg
// standing is poor

8
code/modules/organs/organ_external.dm
View File

@@ -326,11 +326,11 @@
owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
// slow healing
var/heal_amt = 0.2
if (W.damage > 20) //this thing's edges are not in day's travel of each other, what healing?
heal_amt = 0
var/heal_amt = 0
if (W.damage < 15) //this thing's edges are not in day's travel of each other, what healing?
heal_amt += 0.2
if(W.is_treated())
if(W.is_treated() && W.damage < 50) //whoa, not even magical band aid can hold it together
heal_amt += 0.3
//we only update wounds once in [wound_update_accuracy] ticks so have to emulate realtime