diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm index 31fb5db6661..e5492e60293 100644 --- a/code/modules/mob/living/carbon/human/species/grey.dm +++ b/code/modules/mob/living/carbon/human/species/grey.dm @@ -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. diff --git a/code/modules/surgery/organs/subtypes/drask.dm b/code/modules/surgery/organs/subtypes/drask.dm index 6e11cf2993e..e457c4cddaa 100644 --- a/code/modules/surgery/organs/subtypes/drask.dm +++ b/code/modules/surgery/organs/subtypes/drask.dm @@ -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 \ No newline at end of file diff --git a/code/modules/surgery/organs/subtypes/grey.dm b/code/modules/surgery/organs/subtypes/grey.dm index 177e4ae5be1..db04c15ed7a 100644 --- a/code/modules/surgery/organs/subtypes/grey.dm +++ b/code/modules/surgery/organs/subtypes/grey.dm @@ -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 \ No newline at end of file + 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 heart" + icon = 'icons/obj/species_organs/grey.dmi' + +/obj/item/organ/internal/kidneys/grey + name = "grey kidneys" + icon = 'icons/obj/species_organs/grey.dmi' \ No newline at end of file diff --git a/icons/obj/species_organs/drask.dmi b/icons/obj/species_organs/drask.dmi new file mode 100644 index 00000000000..082d3e0f4f2 Binary files /dev/null and b/icons/obj/species_organs/drask.dmi differ diff --git a/icons/obj/species_organs/grey.dmi b/icons/obj/species_organs/grey.dmi index 1d5bf293fe7..c228f30c005 100644 Binary files a/icons/obj/species_organs/grey.dmi and b/icons/obj/species_organs/grey.dmi differ diff --git a/icons/obj/species_organs/kidan.dmi b/icons/obj/species_organs/kidan.dmi new file mode 100644 index 00000000000..f1abb28354f Binary files /dev/null and b/icons/obj/species_organs/kidan.dmi differ diff --git a/icons/obj/species_organs/plasmaman.dmi b/icons/obj/species_organs/plasmaman.dmi new file mode 100644 index 00000000000..6aa2b081844 Binary files /dev/null and b/icons/obj/species_organs/plasmaman.dmi differ diff --git a/icons/obj/species_organs/skrell.dmi b/icons/obj/species_organs/skrell.dmi new file mode 100644 index 00000000000..9cf1394a4be Binary files /dev/null and b/icons/obj/species_organs/skrell.dmi differ diff --git a/icons/obj/species_organs/tajaran.dmi b/icons/obj/species_organs/tajaran.dmi new file mode 100644 index 00000000000..92a2db4bcaa Binary files /dev/null and b/icons/obj/species_organs/tajaran.dmi differ diff --git a/icons/obj/species_organs/vox.dmi b/icons/obj/species_organs/vox.dmi new file mode 100644 index 00000000000..cc017ab0add Binary files /dev/null and b/icons/obj/species_organs/vox.dmi differ diff --git a/icons/obj/species_organs/vulpkanin.dmi b/icons/obj/species_organs/vulpkanin.dmi new file mode 100644 index 00000000000..92a2db4bcaa Binary files /dev/null and b/icons/obj/species_organs/vulpkanin.dmi differ