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

Redoes the variable changes into procs

Browse Source
This commit is contained in:
Artur
2021-05-05 18:15:13 +03:00
parent 28205f9dce
commit 35bfba1f6a
15 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+1 -1
View File
@@ -574,7 +574,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(AmBloodsucker(C))
disgust_bloodsucker(FALSE, 1) //Bloodsuckers get SOME blood from it, for style reasons.
if(C.blood_volume < (BLOOD_VOLUME_NORMAL*C.blood_ratio))
C.integrating_blood += 3 //Bloody Mary quickly restores blood loss.
C.AddIntegrationBlood(3) //Bloody Mary quickly restores blood loss.
..()
/datum/reagent/consumable/ethanol/brave_bull
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+3 -2
View File
@@ -409,6 +409,7 @@
last_added = 0
if(M.blood_volume < maximum_reachable) //Can only up to double your effective blood level.
last_added = volume * 5
M.AddIntegrationBlood(last_added)
if(prob(33))
M.adjustBruteLoss(-0.5*REM, 0)
M.adjustFireLoss(-0.5*REM, 0)
@@ -1271,7 +1272,7 @@
M.adjustCloneLoss(-3*REM, FALSE)
M.adjustStaminaLoss(-25*REM,FALSE)
if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio))
M.integrating_blood += 40 // blood fall out man bad
M.AddIntegrationBlood(40) // blood fall out man bad
..()
. = 1
@@ -1292,7 +1293,7 @@
M.adjustCloneLoss(-1.25*REM, FALSE)
M.adjustStaminaLoss(-4*REM,FALSE)
if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio))
M.integrating_blood += 3
M.AddIntegrationBlood(3)
..()
. = 1
code/modules/reagents/chemistry/reagents/other_reagents.dm
+6 -6
View File
@@ -48,7 +48,7 @@
var/mob/living/carbon/C = L
var/blood_id = C.get_blood_id()
if((HAS_TRAIT(C, TRAIT_NOMARROW) || blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood) && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
C.integrating_blood += round(reac_volume, 0.1)
C.AddIntegrationBlood(round(reac_volume, 0.1))
// we don't care about bloodtype here, we're just refilling the mob
if(reac_volume >= 10 && istype(L) && method != INJECT)
@@ -253,7 +253,7 @@
/datum/reagent/water/on_mob_life(mob/living/carbon/M)
. = ..()
if(M.blood_volume)
M.integrating_blood += 0.1 // water is good for you!
M.AddIntegrationBlood(0.1) // water is good for you!
/*
* Water reaction to turf
@@ -368,7 +368,7 @@
/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
if(M.blood_volume)
M.integrating_blood += 0.1 // water is good for you!
M.AddIntegrationBlood(0.1) // water is good for you!
if(!data)
data = list("misc" = 1)
data["misc"]++
@@ -454,7 +454,7 @@
M.adjustBruteLoss(-2, FALSE)
M.adjustFireLoss(-2, FALSE)
if(ishuman(M) && M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio))
M.integrating_blood += 3
M.AddIntegrationBlood(3)
else // Will deal about 90 damage when 50 units are thrown
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
M.adjustToxLoss(2, FALSE)
@@ -1144,7 +1144,7 @@
if((HAS_TRAIT(C, TRAIT_NOMARROW)))
return
if(C.blood_volume < (BLOOD_VOLUME_NORMAL*C.blood_ratio))
C.integrating_blood += 0.25
C.AddIntegrationBlood(0.25)
..()
/datum/reagent/iron/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -2550,7 +2550,7 @@
M.adjustBruteLoss(-3, FALSE)
M.adjustFireLoss(-3, FALSE)
if(ishuman(M) && M.blood_volume < BLOOD_VOLUME_NORMAL)
M.integrating_blood += 3
M.AddIntegrationBlood(3)
else
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
M.adjustToxLoss(2, FALSE)