cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 21:17:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42247 from granpawalton/fix/NOLIVER-not-handling-regeants

Browse Source 
Xenos now have a liver and process reagents
This commit is contained in:
Jordie
2019-01-07 21:00:53 +11:00
committed by GitHub
parent a118343000 f686f43a9c
commit b62359843d
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/alien.dm
+1
View File
@@ -40,6 +40,7 @@
internal_organs += new /obj/item/organ/alien/hivenode
internal_organs += new /obj/item/organ/tongue/alien
internal_organs += new /obj/item/organ/eyes/night_vision/alien
internal_organs += new /obj/item/organ/liver/alien
internal_organs += new /obj/item/organ/ears
..()
code/modules/mob/living/carbon/life.dm
+1 -1
View File
@@ -585,7 +585,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
/mob/living/carbon/proc/handle_liver()
var/obj/item/organ/liver/liver = getorganslot(ORGAN_SLOT_LIVER)
if((!dna && !liver) || (NOLIVER in dna.species.species_traits))
if((!dna || !liver) || (NOLIVER in dna.species.species_traits))
return
if(liver)
if(liver.damage >= liver.maxHealth)
code/modules/surgery/organs/liver.dm
+7
View File
@@ -73,6 +73,13 @@
icon_state = "liver-p"
desc = "A large crystal that is somehow capable of metabolizing chemicals, these are found in plasmamen."
/obj/item/organ/liver/alien
name = "alien liver" // doesnt matter for actual aliens because they dont take toxin damage
icon_state = "liver-x" // Same sprite as fly-person liver.
desc = "A liver that used to belong to a killer alien, who knows what it used to eat."
toxLethality = LIVER_DEFAULT_TOX_LETHALITY * 2.5 // rejects its owner early after too much punishment
toxTolerance = 15 // complete toxin immunity like xenos have would be too powerful
/obj/item/organ/liver/cybernetic
name = "cybernetic liver"
icon_state = "liver-c"