Merge pull request #10795 from Quantum-M/alienOrgans

[Ready for Review]Adds different looking organs to each species, some blood color changes, and MMI changes
This commit is contained in:
variableundefined
2019-03-14 15:04:29 +08:00
committed by GitHub
30 changed files with 265 additions and 56 deletions
@@ -8,10 +8,10 @@
butt_sprite = "grey"
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/grey,
"lungs" = /obj/item/organ/internal/lungs/grey,
"liver" = /obj/item/organ/internal/liver/grey,
"kidneys" = /obj/item/organ/internal/kidneys,
"kidneys" = /obj/item/organ/internal/kidneys/grey,
"brain" = /obj/item/organ/internal/brain/grey,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/grey //5 darksight.
@@ -20,13 +20,13 @@
butt_sprite = "kidan"
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/kidan,
"lungs" = /obj/item/organ/internal/lungs/kidan,
"liver" = /obj/item/organ/internal/liver/kidan,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/kidan,
"brain" = /obj/item/organ/internal/brain/kidan,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes, //Default darksight of 2.
"eyes" = /obj/item/organ/internal/eyes/kidan, //Default darksight of 2.
"lantern" = /obj/item/organ/internal/lantern
)
@@ -108,11 +108,11 @@
tail = "farwatail"
reagent_tag = PROCESS_ORG
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/tajaran,
"lungs" = /obj/item/organ/internal/lungs/tajaran,
"liver" = /obj/item/organ/internal/liver/tajaran,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/tajaran,
"brain" = /obj/item/organ/internal/brain/tajaran,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/tajaran/farwa //Tajara monkey-forms are uniquely colourblind and have excellent darksight, which is why they need a subtype of their greater-form's organ..
)
@@ -132,11 +132,11 @@
tail = "wolpintail"
reagent_tag = PROCESS_ORG
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/vulpkanin,
"lungs" = /obj/item/organ/internal/lungs/vulpkanin,
"liver" = /obj/item/organ/internal/liver/vulpkanin,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/vulpkanin,
"brain" = /obj/item/organ/internal/brain/vulpkanin,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/vulpkanin/wolpin //Vulpkanin monkey-forms are uniquely colourblind and have excellent darksight, which is why they need a subtype of their greater-form's organ..
)
@@ -156,6 +156,16 @@
reagent_tag = PROCESS_ORG
tail = null
has_organ = list(
"heart" = /obj/item/organ/internal/heart/skrell,
"lungs" = /obj/item/organ/internal/lungs/skrell,
"liver" = /obj/item/organ/internal/liver/skrell,
"kidneys" = /obj/item/organ/internal/kidneys/skrell,
"brain" = /obj/item/organ/internal/brain/skrell,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/skrell //Tajara monkey-forms are uniquely colourblind and have excellent darksight, which is why they need a subtype of their greater-form's organ..
)
/datum/species/monkey/unathi
name = "Stok"
name_plural = "Stok"
@@ -171,3 +181,13 @@
reagent_tag = PROCESS_ORG
bodyflags = HAS_TAIL
has_organ = list(
"heart" = /obj/item/organ/internal/heart/unathi,
"lungs" = /obj/item/organ/internal/lungs/unathi,
"liver" = /obj/item/organ/internal/liver/unathi,
"kidneys" = /obj/item/organ/internal/kidneys/unathi,
"brain" = /obj/item/organ/internal/brain/unathi,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/unathi
)
@@ -30,13 +30,13 @@
"shows their true colors, which happens to be the color of plasma!")
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"heart" = /obj/item/organ/internal/heart/plasmaman,
"lungs" = /obj/item/organ/internal/lungs/plasmaman,
"liver" = /obj/item/organ/internal/liver,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"liver" = /obj/item/organ/internal/liver/plasmaman,
"kidneys" = /obj/item/organ/internal/kidneys/plasmaman,
"brain" = /obj/item/organ/internal/brain/plasmaman,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes
"eyes" = /obj/item/organ/internal/eyes/plasmaman
)
speciesbox = /obj/item/storage/box/survival_plasmaman
@@ -28,13 +28,13 @@
butt_sprite = "skrell"
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/skrell,
"lungs" = /obj/item/organ/internal/lungs/skrell,
"liver" = /obj/item/organ/internal/liver/skrell,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/skrell,
"brain" = /obj/item/organ/internal/brain/skrell,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes, //Default darksight of 2.
"eyes" = /obj/item/organ/internal/eyes/skrell, //Default darksight of 2.
"headpocket" = /obj/item/organ/internal/headpocket
)
@@ -30,16 +30,17 @@
dietflags = DIET_OMNI
taste_sensitivity = TASTE_SENSITIVITY_SHARP
reagent_tag = PROCESS_ORG
flesh_color = "#AFA59E"
base_color = "#424242"
butt_sprite = "tajaran"
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/tajaran,
"lungs" = /obj/item/organ/internal/lungs/tajaran,
"liver" = /obj/item/organ/internal/liver/tajaran,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/tajaran,
"brain" = /obj/item/organ/internal/brain/tajaran,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/tajaran /*Most Tajara see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
@@ -38,11 +38,11 @@
brute_mod = 1.05
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/unathi,
"lungs" = /obj/item/organ/internal/lungs/unathi,
"liver" = /obj/item/organ/internal/liver/unathi,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/unathi,
"brain" = /obj/item/organ/internal/brain/unathi,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/unathi //3 darksight.
)
@@ -62,13 +62,13 @@
)
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"heart" = /obj/item/organ/internal/heart/vox,
"lungs" = /obj/item/organ/internal/lungs/vox,
"liver" = /obj/item/organ/internal/liver/vox,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/vox,
"brain" = /obj/item/organ/internal/brain/vox,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes, //Default darksight of 2.
"eyes" = /obj/item/organ/internal/eyes/vox, //Default darksight of 2.
"stack" = /obj/item/organ/internal/stack //Not the same as the cortical stack implant Vox Raiders spawn with. The cortical stack implant is used
) //for determining the success of the heist game-mode's 'leave nobody behind' objective, while this is just an organ.
@@ -22,6 +22,7 @@
hunger_drain = 0.11
taste_sensitivity = TASTE_SENSITIVITY_SHARP
reagent_tag = PROCESS_ORG
flesh_color = "#966464"
base_color = "#CF4D2F"
butt_sprite = "vulp"
@@ -29,11 +30,11 @@
scream_verb = "yelps"
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
"lungs" = /obj/item/organ/internal/lungs,
"heart" = /obj/item/organ/internal/heart/vulpkanin,
"lungs" = /obj/item/organ/internal/lungs/vulpkanin,
"liver" = /obj/item/organ/internal/liver/vulpkanin,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
"kidneys" = /obj/item/organ/internal/kidneys/vulpkanin,
"brain" = /obj/item/organ/internal/brain/vulpkanin,
"appendix" = /obj/item/organ/internal/appendix,
"eyes" = /obj/item/organ/internal/eyes/vulpkanin /*Most Vulpkanin see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
+5 -2
View File
@@ -315,7 +315,8 @@
/obj/item/organ/internal/lungs/plasmaman
name = "plasma filter"
desc = "A spongy rib-shaped mass for filtering plasma from the air."
icon_state = "lungs-plasma"
icon = 'icons/obj/species_organs/plasmaman.dmi'
icon_state = "lungs"
safe_oxygen_min = 0 //We don't breath this
safe_toxins_min = 16 //We breathe THIS!
@@ -324,6 +325,8 @@
/obj/item/organ/internal/lungs/vox
name = "Vox lungs"
desc = "They're filled with dust....wow."
icon = 'icons/obj/species_organs/vox.dmi'
icon_state = "lungs"
safe_oxygen_min = 0 //We don't breathe this
safe_oxygen_max = 0.05 //This is toxic to us
@@ -331,7 +334,7 @@
oxy_damage_type = TOX //And it poisons us
/obj/item/organ/internal/lungs/drask
icon = 'icons/obj/surgery_drask.dmi'
icon = 'icons/obj/species_organs/drask.dmi'
cold_message = "an invigorating coldness"
cold_level_3_threshold = 60
@@ -1,29 +1,29 @@
//DRASK ORGAN
/obj/item/organ/internal/drask
name = "drask organ"
icon = 'icons/obj/surgery_drask.dmi'
icon = 'icons/obj/species_organs/drask.dmi'
icon_state = "innards"
desc = "A greenish, slightly translucent organ. It is extremely cold."
/obj/item/organ/internal/heart/drask
name = "drask heart"
icon = 'icons/obj/surgery_drask.dmi'
icon = 'icons/obj/species_organs/drask.dmi'
parent_organ = "head"
/obj/item/organ/internal/liver/drask
name = "metabolic strainer"
icon = 'icons/obj/surgery_drask.dmi'
icon = 'icons/obj/species_organs/drask.dmi'
icon_state = "kidneys"
alcohol_intensity = 0.8
/obj/item/organ/internal/brain/drask
icon = 'icons/obj/surgery_drask.dmi'
icon = 'icons/obj/species_organs/drask.dmi'
icon_state = "brain2"
mmi_icon = 'icons/obj/surgery_drask.dmi'
mmi_icon = 'icons/obj/species_organs/drask.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/eyes/drask
name = "drask eyeballs"
icon = 'icons/obj/surgery_drask.dmi'
icon = 'icons/obj/species_organs/drask.dmi'
desc = "Drask eyes. They look even stranger disembodied"
dark_view = 5
+23 -3
View File
@@ -1,9 +1,15 @@
/obj/item/organ/internal/liver/grey
name = "grey liver"
desc = "A small, odd looking liver"
icon = 'icons/obj/species_organs/grey.dmi'
alcohol_intensity = 1.6
/obj/item/organ/internal/brain/grey
icon_state = "brain-x"
mmi_icon_state = "mmi_alien"
desc = "A large brain"
icon = 'icons/obj/species_organs/grey.dmi'
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/grey.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/brain/grey/insert(var/mob/living/carbon/M, var/special = 0)
..()
@@ -15,4 +21,18 @@
/obj/item/organ/internal/eyes/grey
name = "grey eyeballs"
dark_view = 5
desc = "They still look creepy and emotionless"
icon = 'icons/obj/species_organs/grey.dmi'
dark_view = 5
/obj/item/organ/internal/heart/grey
name = "grey heart"
icon = 'icons/obj/species_organs/grey.dmi'
/obj/item/organ/internal/lungs/grey
name = "grey lungs"
icon = 'icons/obj/species_organs/grey.dmi'
/obj/item/organ/internal/kidneys/grey
name = "grey kidneys"
icon = 'icons/obj/species_organs/grey.dmi'
@@ -1,6 +1,9 @@
/obj/item/organ/internal/liver/kidan
name = "kidan liver"
icon = 'icons/obj/species_organs/kidan.dmi'
alcohol_intensity = 0.5
#define KIDAN_LANTERN_HUNGERCOST 0.5
#define KIDAN_LANTERN_MINHUNGER 150
#define KIDAN_LANTERN_LIGHT 5
@@ -8,6 +11,7 @@
/obj/item/organ/internal/lantern
name = "Bioluminescent Lantern"
desc = "A specialized tissue that reacts with oxygen, nutriment and blood to produce light in Kidan."
icon = 'icons/obj/species_organs/kidan.dmi'
icon_state = "kid_lantern"
origin_tech = "biotech=2"
w_class = WEIGHT_CLASS_TINY
@@ -107,6 +111,28 @@
. = ..()
/obj/item/organ/internal/eyes/kidan
name = "kidan eyeballs"
icon = 'icons/obj/species_organs/kidan.dmi'
/obj/item/organ/internal/heart/kidan
name = "kidan heart"
icon = 'icons/obj/species_organs/kidan.dmi'
/obj/item/organ/internal/brain/kidan
icon = 'icons/obj/species_organs/kidan.dmi'
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/kidan.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/kidan
name = "kidan lungs"
icon = 'icons/obj/species_organs/kidan.dmi'
/obj/item/organ/internal/kidneys/kidan
name = "kidan kidneys"
icon = 'icons/obj/species_organs/kidan.dmi'
#undef KIDAN_LANTERN_HUNGERCOST
#undef KIDAN_LANTERN_MINHUNGER
#undef KIDAN_LANTERN_LIGHT
@@ -0,0 +1,21 @@
/obj/item/organ/internal/liver/plasmaman
name = "plasmaman liver"
icon = 'icons/obj/species_organs/plasmaman.dmi'
/obj/item/organ/internal/eyes/plasmaman
name = "plasmaman eyeballs"
icon = 'icons/obj/species_organs/plasmaman.dmi'
/obj/item/organ/internal/heart/plasmaman
name = "plasmaman heart"
icon = 'icons/obj/species_organs/plasmaman.dmi'
/obj/item/organ/internal/brain/plasmaman
icon = 'icons/obj/species_organs/plasmaman.dmi'
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/plasmaman.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/kidneys/plasmaman
name = "plasmaman kidneys"
icon = 'icons/obj/species_organs/plasmaman.dmi'
@@ -1,9 +1,12 @@
/obj/item/organ/internal/liver/skrell
name = "skrell liver"
icon = 'icons/obj/species_organs/skrell.dmi'
alcohol_intensity = 4
/obj/item/organ/internal/headpocket
name = "headpocket"
desc = "Allows Skrell to hide tiny objects within their head tentacles."
icon = 'icons/obj/species_organs/skrell.dmi'
icon_state = "skrell_headpocket"
origin_tech = "biotech=2"
w_class = WEIGHT_CLASS_TINY
@@ -59,3 +62,28 @@
/obj/item/organ/internal/headpocket/hear_message(mob/living/M as mob, msg)
pocket.hear_message(M, msg)
..()
/obj/item/organ/internal/heart/skrell
name = "skrell heart"
desc = "A stream lined heart"
icon = 'icons/obj/species_organs/skrell.dmi'
/obj/item/organ/internal/brain/skrell
icon = 'icons/obj/species_organs/skrell.dmi'
desc = "A brain with a odd division in the middle."
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/skrell.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/skrell
name = "skrell lungs"
icon = 'icons/obj/species_organs/skrell.dmi'
/obj/item/organ/internal/kidneys/skrell
name = "skrell kidneys"
icon = 'icons/obj/species_organs/skrell.dmi'
desc = "The smallest kidneys you have ever seen, it probably doesn't even work."
/obj/item/organ/internal/eyes/skrell
name = "skrell eyeballs"
icon = 'icons/obj/species_organs/skrell.dmi'
@@ -1,7 +1,10 @@
/obj/item/organ/internal/liver/tajaran
name = "tajaran liver"
icon = 'icons/obj/species_organs/tajaran.dmi'
alcohol_intensity = 1.4
/obj/item/organ/internal/eyes/tajaran
icon = 'icons/obj/species_organs/tajaran.dmi'
name = "tajaran eyeballs"
colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
replace_colours = LIST_TAJ_REPLACE
@@ -12,3 +15,21 @@
colourmatrix = MATRIX_TAJ_CBLIND
dark_view = 8
replace_colours = LIST_TAJ_REPLACE
/obj/item/organ/internal/heart/tajaran
name = "tajaran heart"
icon = 'icons/obj/species_organs/tajaran.dmi'
/obj/item/organ/internal/brain/tajaran
icon = 'icons/obj/species_organs/tajaran.dmi'
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/tajaran.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/tajaran
name = "tajaran lungs"
icon = 'icons/obj/species_organs/tajaran.dmi'
/obj/item/organ/internal/kidneys/tajaran
name = "tajaran kidneys"
icon = 'icons/obj/species_organs/tajaran.dmi'
+25 -1
View File
@@ -1,6 +1,30 @@
/obj/item/organ/internal/liver/unathi
name = "unathi liver"
icon = 'icons/obj/species_organs/unathi.dmi'
desc = "A large looking liver"
alcohol_intensity = 0.8
/obj/item/organ/internal/eyes/unathi
name = "unathi eyeballs"
dark_view = 3
icon = 'icons/obj/species_organs/unathi.dmi'
dark_view = 3
/obj/item/organ/internal/heart/unathi
name = "unathi heart"
desc = "A large looking heart"
icon = 'icons/obj/species_organs/unathi.dmi'
/obj/item/organ/internal/brain/unathi
icon = 'icons/obj/species_organs/unathi.dmi'
desc = "A smallish looking brain."
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/unathi.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/unathi
name = "unathi lungs"
icon = 'icons/obj/species_organs/unathi.dmi'
/obj/item/organ/internal/kidneys/unathi
name = "unathi kidneys"
icon = 'icons/obj/species_organs/unathi.dmi'
+23 -1
View File
@@ -1,9 +1,12 @@
/obj/item/organ/internal/liver/vox
name = "vox liver"
icon = 'icons/obj/species_organs/vox.dmi'
alcohol_intensity = 1.6
/obj/item/organ/internal/stack
name = "cortical stack"
icon = 'icons/obj/species_organs/vox.dmi'
icon_state = "cortical-stack"
parent_organ = "head"
organ_tag = "stack"
@@ -29,4 +32,23 @@
owner.AdjustConfused(4)
if(!stackdamaged)
stackdamaged = TRUE
..()
..()
/obj/item/organ/internal/eyes/vox
name = "vox eyeballs"
icon = 'icons/obj/species_organs/vox.dmi'
/obj/item/organ/internal/heart/vox
name = "vox heart"
icon = 'icons/obj/species_organs/vox.dmi'
/obj/item/organ/internal/brain/vox
icon = 'icons/obj/species_organs/vox.dmi'
desc = "A brain with spikes on top of it. It has some odd metallic slot with wires on the side."
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/vox.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/kidneys/vox
name = "vox kidneys"
icon = 'icons/obj/species_organs/vox.dmi'
@@ -1,8 +1,11 @@
/obj/item/organ/internal/liver/vulpkanin
name = "vulpkanin liver"
icon = 'icons/obj/species_organs/vulpkanin.dmi'
alcohol_intensity = 1.4
/obj/item/organ/internal/eyes/vulpkanin
name = "vulpkanin eyeballs"
icon = 'icons/obj/species_organs/vulpkanin.dmi'
colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
replace_colours = LIST_VULP_REPLACE
dark_view = 8
@@ -11,4 +14,22 @@
name = "wolpin eyeballs"
colourmatrix = MATRIX_VULP_CBLIND
dark_view = 8
replace_colours = LIST_VULP_REPLACE
replace_colours = LIST_VULP_REPLACE
/obj/item/organ/internal/heart/vulpkanin
name = "vulpkanin heart"
icon = 'icons/obj/species_organs/vulpkanin.dmi'
/obj/item/organ/internal/brain/vulpkanin
icon = 'icons/obj/species_organs/vulpkanin.dmi'
icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/vulpkanin.dmi'
mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/vulpkanin
name = "vulpkanin lungs"
icon = 'icons/obj/species_organs/vulpkanin.dmi'
/obj/item/organ/internal/kidneys/vulpkanin
name = "vulpkanin kidneys"
icon = 'icons/obj/species_organs/vulpkanin.dmi'