shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed increase/decrease blood var.

Browse Source
This commit is contained in:
Fermi
2019-06-13 01:58:26 +01:00
parent 18292d4fc6
commit 9effbb1e33
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/traits/negative.dm
-3
View File
@@ -324,7 +324,6 @@
gain_text = "<span class='danger'>There's a lot on your mind right now.</span>" gain_text = "<span class='danger'>There's a lot on your mind right now.</span>"
lose_text = "<span class='notice'>Your mind finally feels calm.</span>" lose_text = "<span class='notice'>Your mind finally feels calm.</span>"
medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events."
<<<<<<< HEAD
//For reviewers: If you think it's a bad idea, feel free to remove it. Removal requested, commented out until the end of review (will remove when fixing merge conflicts). //For reviewers: If you think it's a bad idea, feel free to remove it. Removal requested, commented out until the end of review (will remove when fixing merge conflicts).
/* /*
@@ -352,5 +351,3 @@
H.apply_status_effect(/datum/status_effect/trance, 200, TRUE) H.apply_status_effect(/datum/status_effect/trance, 200, TRUE)
qdel(src) qdel(src)
*/ */
=======
>>>>>>> f3a3e4c47ae527bd576fcee254836e1c1d8bdfcb
code/modules/mob/living/blood.dm
-1
View File
@@ -55,7 +55,6 @@
//Effects of bloodloss //Effects of bloodloss
var/word = pick("dizzy","woozy","faint") var/word = pick("dizzy","woozy","faint")
//switch(blood_volume) Used to be a switch statement; now it uses ifs (so blood ratio can work.) Check my logic please.
switch(blood_volume * INVERSE(blood_ratio)) switch(blood_volume * INVERSE(blood_ratio))
if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
if(prob(5)) if(prob(5))