cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-13 11:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into nukechickens_forge2

Browse Source
This commit is contained in:
Nukechickenu64
2022-10-11 15:47:54 -04:00
parent 1f5387607f 700b76cad7
commit f945deb3f7
22 changed files with 10023 additions and 9645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__SPLURTCODE/DEFINES/traits.dm
View File

@@ -17,5 +17,7 @@
#define TRAIT_PHARMA "hepatic_pharmacokinesis"
#define TRAIT_CHOKE_SLUT "choke_slut"
#define BLOODFLEDGE "BloodFledge"//splurt change
#define TRAIT_INCUBUS "Incubus"
#define TRAIT_SUCCUBUS "Succubus"

2
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -57,7 +57,7 @@
/datum/reagent/blood/on_mob_life(mob/living/carbon/C) //Because lethals are preferred over stamina. damnifino.
var/blood_id = C.get_blood_id()
if((blood_id in GLOB.blood_reagent_types) && !HAS_TRAIT(C, TRAIT_NOMARROW))
if((blood_id in GLOB.blood_reagent_types) && !HAS_TRAIT(C, TRAIT_NOMARROW) && !HAS_TRAIT(C, BLOODFLEDGE))
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)*REAGENTS_EFFECT_MULTIPLIER, TRUE, TRUE) //forced to ensure people don't use it to gain beneficial toxin as slime person
..()