cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes eye_color runtimes for Drask, Kidan, and Nian (#25856)

Browse Source 
* null check for eyes

* return ternary
This commit is contained in:
chuga-git
2024-06-12 19:19:04 +00:00
committed by GitHub
parent 9ea4320f46
commit 4ab93fb50e
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/drask.dm
+1 -1
View File
@@ -68,4 +68,4 @@
/datum/species/drask/get_species_runechat_color(mob/living/carbon/human/H)
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
return E.eye_color
return E ? E.eye_color : flesh_color
code/modules/mob/living/carbon/human/species/grey.dm
+1 -3
View File
@@ -89,6 +89,4 @@
/datum/species/grey/get_species_runechat_color(mob/living/carbon/human/H)
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
if(E)
return E.eye_color
return flesh_color
return E ? E.eye_color : flesh_color
code/modules/mob/living/carbon/human/species/kidan.dm
+1 -1
View File
@@ -59,4 +59,4 @@
/datum/species/kidan/get_species_runechat_color(mob/living/carbon/human/H)
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
return E.eye_color
return E ? E.eye_color : flesh_color
code/modules/mob/living/carbon/human/species/moth.dm
+1 -1
View File
@@ -105,7 +105,7 @@
/datum/species/moth/get_species_runechat_color(mob/living/carbon/human/H)
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
return E.eye_color
return E ? E.eye_color : flesh_color
/datum/species/moth/spec_attacked_by(obj/item/I, mob/living/user, obj/item/organ/external/affecting, intent, mob/living/carbon/human/H)
if(istype(I, /obj/item/melee/flyswatter) && I.force)