cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
This commit is contained in:
PsiOmega
2015-06-07 10:51:41 +02:00
parent 6eea4ae7da 18a2d69c06
commit fc6de24042
21 changed files with 144 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_icon.dm
+3 -1
View File
@@ -47,7 +47,9 @@ var/global/list/limb_icon_cache = list()
..()
overlays.Cut()
if(species.has_organ["eyes"])
if(!owner || !owner.species)
return
if(owner.species.has_organ["eyes"])
var/obj/item/organ/eyes/eyes = owner.internal_organs_by_name["eyes"]
if(species.eyes)
var/icon/eyes_icon = new/icon('icons/mob/human_face.dmi', species.eyes)