Adds defines for organ slots

This commit is contained in:
Jordan Brown
2017-10-15 20:33:35 -04:00
committed by CitadelStationBot
parent be2dc49384
commit f205911b5a
56 changed files with 323 additions and 118 deletions
@@ -38,7 +38,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
var/mob/living/carbon/human/H = M
if(H.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
H.drunkenness = max((H.drunkenness + (sqrt(volume) * boozepwr * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
var/obj/item/organ/liver/L = H.getorganslot("liver")
var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
H.applyLiverDamage((max(sqrt(volume) * boozepwr * L.alcohol_tolerance, 0))/10)
return ..() || .
@@ -550,7 +550,7 @@
if(!M.is_mouth_covered() && !M.is_eyes_covered())
unprotected = TRUE
if(unprotected)
if(!M.getorganslot("eye_sight")) //can't blind somebody with no eyes
if(!M.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes
to_chat(M, "<span class = 'notice'>Your eye sockets feel wet.</span>")
else
if(!M.eye_blurry)
@@ -671,7 +671,11 @@
taste_description = "dull toxin"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
<<<<<<< HEAD
var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
=======
var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
>>>>>>> 04c05d8... Adds defines for organ slots (#31737)
if (!eyes)
return
if(M.disabilities & BLIND)
@@ -1568,7 +1568,7 @@
/datum/reagent/romerol/on_mob_life(mob/living/carbon/human/H)
// Silently add the zombie infection organ to be activated upon death
if(!H.getorganslot("zombie_infection"))
if(!H.getorganslot(ORGAN_SLOT_ZOMBIE))
var/obj/item/organ/zombie_infection/ZI = new()
ZI.Insert(H)
..()