cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16574 from S34NW/brain_damage_avoidance_fix

Browse Source 
Fixes bug with species organ list
This commit is contained in:
variableundefined
2021-09-01 20:02:22 -05:00
committed by GitHub
parent 50ec519bcd 5ad2a9229f
commit 2225fff357
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/diona.dm
+7 -6
View File
@@ -10,6 +10,7 @@
burn_mod = 1.25
heatmod = 1.5
brain_mod = 0
var/pod = FALSE //did they come from a pod? If so, they're stronger than normal Diona.
blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
@@ -37,13 +38,13 @@
reagent_tag = PROCESS_ORG
has_organ = list(
"nutrient channel" = /obj/item/organ/internal/liver/diona,
"respiratory vacuoles" = /obj/item/organ/internal/lungs/diona,
"neural strata" = /obj/item/organ/internal/heart/diona,
"liver" = /obj/item/organ/internal/liver/diona,
"lungs" = /obj/item/organ/internal/lungs/diona,
"heart" = /obj/item/organ/internal/heart/diona,
"eyes" = /obj/item/organ/internal/eyes/diona, //Default darksight of 2.
"gas bladder" = /obj/item/organ/internal/brain/diona,
"polyp segment" = /obj/item/organ/internal/kidneys/diona,
"anchoring ligament" = /obj/item/organ/internal/appendix/diona
"brain" = /obj/item/organ/internal/brain/diona,
"kidneys" = /obj/item/organ/internal/kidneys/diona,
"appendix" = /obj/item/organ/internal/appendix/diona
)
has_limbs = list(
"chest" = list("path" = /obj/item/organ/external/chest/diona),
code/modules/mob/living/carbon/human/species/drask.dm
+1 -1
View File
@@ -56,7 +56,7 @@
has_organ = list(
"heart" = /obj/item/organ/internal/heart/drask,
"lungs" = /obj/item/organ/internal/lungs/drask,
"metabolic strainer" = /obj/item/organ/internal/liver/drask,
"liver" = /obj/item/organ/internal/liver/drask,
"eyes" = /obj/item/organ/internal/eyes/drask, //5 darksight.
"brain" = /obj/item/organ/internal/brain/drask
)
code/modules/mob/living/carbon/human/species/nucleation.dm
+1 -1
View File
@@ -24,7 +24,7 @@
reagent_tag = PROCESS_ORG
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"crystallized brain" = /obj/item/organ/internal/brain/crystal,
"brain" = /obj/item/organ/internal/brain/crystal,
"eyes" = /obj/item/organ/internal/eyes/luminescent_crystal, //Standard darksight of 2.
"strange crystal" = /obj/item/organ/internal/nucleation/strange_crystal
)
code/modules/mob/living/carbon/human/species/vox.dm
+1 -1
View File
@@ -59,7 +59,7 @@
"lungs" = /obj/item/organ/internal/lungs/vox,
"liver" = /obj/item/organ/internal/liver/vox,
"kidneys" = /obj/item/organ/internal/kidneys/vox,
"cortical stack" = /obj/item/organ/internal/brain/vox,
"brain" = /obj/item/organ/internal/brain/vox,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/vox, //Default darksight of 2.
) //for determining the success of the heist game-mode's 'leave nobody behind' objective, while this is just an organ.