Merge pull request #9724 from Novacat/nova-basicfixes

Earlyports Polaris Fixes
This commit is contained in:
Novacat
2021-02-15 17:47:36 -05:00
committed by Chompstation Bot
parent e7ca4001ac
commit 15f5770983
3 changed files with 5 additions and 2 deletions

View File

@@ -10,6 +10,7 @@
icon_state = null
flags = OPENCONTAINER
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5,10,15,25,30)
volume = 50
var/trash = null

View File

@@ -252,7 +252,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
icon_key += "[r_eyes], [g_eyes], [b_eyes]"
var/obj/item/organ/external/head/head = organs_by_name[BP_HEAD]
if(head)
icon_key += "[head.eye_icon]"
if(!istype(head, /obj/item/organ/external/stump))
icon_key += "[head.eye_icon]"
for(var/organ_tag in species.has_limbs)
var/obj/item/organ/external/part = organs_by_name[organ_tag]
if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff.

View File

@@ -137,7 +137,8 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
var/obj/item/organ/internal/brain/B = src
if(istype(B) && owner)
B.transfer_identity(owner)
if(istype(owner, /mob/living/carbon))
B.transfer_identity(owner)
..()