cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.

Browse Source 
Conflicts:
	code/modules/organs/blood.dm
This commit is contained in:
Zuhayr
2014-01-07 00:01:27 -05:00
committed by ZomgPonies
parent e09a00fe0e
commit 07c1506551
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/blood.dm
+4 -4
View File
@@ -13,14 +13,14 @@ 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)
if(vessel)
return
vessel = new/datum/reagents(600)
vessel.my_atom = src
if(species && species.flags & NO_BLOOD) //We want the var for safety but we can do without the actual blood.
return
if(species.bloodflags &BLOOD_SLIME)
vessel.add_reagent("water",560)
else
code/modules/organs/pain.dm
+2 -2
View File
@@ -54,7 +54,7 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
if(stat >= 1) return
if(species && species.flags & IS_PLANT) return
if(species && species.flags & NO_PAIN) return
if(reagents.has_reagent("tramadol"))
return
@@ -75,7 +75,7 @@ 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(species && species.flags & NO_PAIN) return
if(stat >= 2) return
if(reagents.has_reagent("tramadol"))