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

Reviewer suggestion and co

Browse Source
This commit is contained in:
Artur
2020-02-26 16:26:57 +02:00
parent 35aecac620
commit b536c061fb
4 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents.dm
+10
View File
@@ -221,3 +221,13 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
rs += "[R.name], [R.volume]"
return rs.Join(" | ")
//For easy bloodsucker disgusting and blood removal
/datum/reagent/proc/disgust_bloodsucker(mob/living/carbon/C, disgust, blood_change, blood_puke = TRUE, force)
if(isvamp(C))
var/datum/antagonist/bloodsucker/bloodsuckerdatum = C.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
if(disgust)
bloodsuckerdatum.handle_eat_human_food(disgust, blood_puke, force)
if(blood_change)
bloodsuckerdatum.AddBloodVolume(blood_change)
code/modules/reagents/chemistry/reagents/other_reagents.dm
+11 -17
View File
@@ -27,8 +27,16 @@
L.ForceContractDisease(D)
if(data["blood_type"] == "SY")
disgust_bloodsucker(L, FALSE, -5, TRUE)
//Synthblood is very disgusting to bloodsuckers. They will puke it out to expel it, unless they have masquarade on
if(reac_volume > 3)
disgust_bloodsucker(L, 5, FALSE, FALSE, TRUE)
//If theres more than 8 units, they will start expelling it, even if they are masquarading.
if(reac_volume > 6)
disgust_bloodsucker(L, 7, -5, TRUE, TRUE)
//If they have too much in them, they will also puke out their blood.
else
disgust_bloodsucker(L, 3, FALSE, FALSE, FALSE)
if(iscarbon(L))
var/mob/living/carbon/C = L
var/blood_id = C.get_blood_id()
@@ -40,10 +48,8 @@
L.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
/datum/reagent/blood/on_mob_life(mob/living/carbon/C) //Because lethals are preferred over stamina. damnifino.
if((HAS_TRAIT(C, TRAIT_NOMARROW)))
return //We dont want vampires getting toxed from blood
var/blood_id = C.get_blood_id()
if((blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood))
if((blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood) && !HAS_TRAIT(C, TRAIT_NOMARROW))
if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type))) //we only care about bloodtype here because this is where the poisoning should be
C.adjustToxLoss(rand(2,8)*REM, TRUE, TRUE) //forced to ensure people don't use it to gain beneficial toxin as slime person
..()
@@ -152,18 +158,6 @@
taste_description = "sap" //Like tree sap?
pH = 7.45
/datum/reagent/blood/tomato/reaction_mob(mob/living/L, method = TOUCH, reac_volume)
..()
disgust_bloodsucker(L, reac_volume * 2, -5, TRUE)
/datum/reagent/proc/disgust_bloodsucker(mob/living/carbon/C, disgust, blood_change, force)
if(isvamp(C))
var/datum/antagonist/bloodsucker/bloodsuckerdatum = C.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
if(disgust)
bloodsuckerdatum.handle_eat_human_food(disgust, force)
if(blood_change)
bloodsuckerdatum.AddBloodVolume(blood_change)
/datum/reagent/blood/jellyblood/on_mob_life(mob/living/carbon/M)
if(prob(10))
if(M.dna?.species?.exotic_bloodtype != "GEL")