From 1d4e584bc52190e7c26d590024557685b31031c8 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:06:47 +0100 Subject: [PATCH 1/2] standardises species organ typepath names --- .../modules/mob/living/carbon/human/species/diona.dm | 12 ++++++------ .../modules/mob/living/carbon/human/species/drask.dm | 2 +- .../mob/living/carbon/human/species/nucleation.dm | 2 +- code/modules/mob/living/carbon/human/species/vox.dm | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm index 3813dedbdd7..769b6b36d7e 100644 --- a/code/modules/mob/living/carbon/human/species/diona.dm +++ b/code/modules/mob/living/carbon/human/species/diona.dm @@ -37,13 +37,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), diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm index 05767c244f1..5f91e9ad1bb 100644 --- a/code/modules/mob/living/carbon/human/species/drask.dm +++ b/code/modules/mob/living/carbon/human/species/drask.dm @@ -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 ) diff --git a/code/modules/mob/living/carbon/human/species/nucleation.dm b/code/modules/mob/living/carbon/human/species/nucleation.dm index 4c2f7623f0e..b4dc9d1f952 100644 --- a/code/modules/mob/living/carbon/human/species/nucleation.dm +++ b/code/modules/mob/living/carbon/human/species/nucleation.dm @@ -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 ) diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index f4ccced8fd8..e7736da2291 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -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. From 5ad2a9229ffe4484280221b7393cac33ff3d51f6 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:26:43 +0100 Subject: [PATCH 2/2] diona are brain damage immune, this time the proper code way --- code/modules/mob/living/carbon/human/species/diona.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm index 769b6b36d7e..294735c434d 100644 --- a/code/modules/mob/living/carbon/human/species/diona.dm +++ b/code/modules/mob/living/carbon/human/species/diona.dm @@ -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 \