diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 60014a89e2..9e7c1c1e87 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1036,8 +1036,10 @@ var/datum/organ/external/head/h = organs_by_name["head"] h.disfigured = 0 - vessel.add_reagent("blood",560-vessel.total_volume) - fixblood() + if(species && !(species.flags & NO_BLOOD)) + vessel.add_reagent("blood",560-vessel.total_volume) + fixblood() + for (var/obj/item/weapon/organ/head/H in world) if(H.brainmob) if(H.brainmob.real_name == src.real_name) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 53b26cc0b9..c586e929bf 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -12,8 +12,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 //Initializes blood vessels /mob/living/carbon/human/proc/make_blood() + if (vessel) return + + if(species && species.flags & NO_BLOOD) + return + vessel = new/datum/reagents(600) vessel.my_atom = src vessel.add_reagent("blood",560) @@ -29,6 +34,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 // Takes care blood loss and regeneration /mob/living/carbon/human/proc/handle_blood() + + if(species && species.flags & NO_BLOOD) + return + if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood. var/blood_volume = round(vessel.get_reagent_amount("blood")) @@ -126,6 +135,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 //Makes a blood drop, leaking certain amount of blood from the mob /mob/living/carbon/human/proc/drip(var/amt as num) + + if(species && species.flags & NO_BLOOD) //TODO: Make drips come from the reagents instead. + return + if(!amt) return @@ -187,8 +200,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 //For humans, blood does not appear from blue, it comes from vessels. /mob/living/carbon/human/take_blood(obj/item/weapon/reagent_containers/container, var/amount) + + if(species && species.flags & NO_BLOOD) + return null + if(vessel.get_reagent_amount("blood") < amount) return null + . = ..() vessel.remove_reagent("blood",amount) // Removes blood if human @@ -210,8 +228,16 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 //Transfers blood from container ot vessels, respecting blood types compatability. /mob/living/carbon/human/inject_blood(obj/item/weapon/reagent_containers/container, var/amount) - var/datum/reagent/blood/our = get_blood(vessel) + var/datum/reagent/blood/injected = get_blood(container.reagents) + + if(species && species.flags & NO_BLOOD) + reagents.add_reagent("blood", amount, injected.data) + reagents.update_total() + return + + var/datum/reagent/blood/our = get_blood(vessel) + if (!injected || !our) return if(blood_incompatible(injected.data["blood_type"],our.data["blood_type"]) ) diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 987e7d026c..a924fa36bb 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -55,6 +55,9 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0 // flash_strength is 0 for weak pain flash, 1 for strong pain flash mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength) if(stat >= 1) return + + if(species && species.flags & IS_PLANT) return + if(reagents.has_reagent("tramadol")) return if(reagents.has_reagent("oxycodone")) @@ -73,6 +76,9 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength) mob/living/carbon/human/proc/handle_pain() // not when sleeping + + if(species && species.flags & IS_PLANT) return + if(stat >= 2) return if(reagents.has_reagent("tramadol")) return