Merge pull request #11503 from VOREStation/upstream-merge-8237

[MIRROR] New Organ Sprites
This commit is contained in:
Aronai Sieyes
2021-08-26 14:01:45 -04:00
committed by Chompstation Bot
parent 145f8172f4
commit c8f54e854e
4 changed files with 10 additions and 2 deletions

View File

@@ -255,13 +255,13 @@
cold_discomfort_level = 215
has_organ = list( //No appendix.
O_HEART = /obj/item/organ/internal/heart,
O_HEART = /obj/item/organ/internal/heart/tajaran,
O_LUNGS = /obj/item/organ/internal/lungs,
O_VOICE = /obj/item/organ/internal/voicebox,
O_LIVER = /obj/item/organ/internal/liver,
O_KIDNEYS = /obj/item/organ/internal/kidneys,
O_BRAIN = /obj/item/organ/internal/brain,
O_EYES = /obj/item/organ/internal/eyes,
O_EYES = /obj/item/organ/internal/eyes/tajaran,
O_STOMACH = /obj/item/organ/internal/stomach,
O_INTESTINE = /obj/item/organ/internal/intestine
)

View File

@@ -0,0 +1,7 @@
/obj/item/organ/internal/eyes/tajaran
icon_state = "tajaran_eyes"
/obj/item/organ/internal/heart/tajaran
icon_state = "tajaran_heart-on"
dead_icon = "tajaran_heart-off"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View File

@@ -3525,6 +3525,7 @@
#include "code\modules\organs\subtypes\slime_vr.dm"
#include "code\modules\organs\subtypes\standard.dm"
#include "code\modules\organs\subtypes\standard_vr.dm"
#include "code\modules\organs\subtypes\tajaran.dm"
#include "code\modules\organs\subtypes\teshari.dm"
#include "code\modules\organs\subtypes\unathi.dm"
#include "code\modules\organs\subtypes\unbreakable.dm"