mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-01-05 15:03:48 +00:00
Lots of species stuff ported from Baystation (#4442)
* Ports species based footprints from bay - https://github.com/Baystation12/Baystation12/pull/17935 - https://i.imgur.com/ojAU373.png - Unathi use claw on right - Taj and tesh use paw in center * Flash stuff glasses protection things * Flash stuff actual thing * Organ mult thingy * Floaty eyes and cloak setup * Species falling
This commit is contained in:
committed by
Anewbe
parent
ddbf7138d9
commit
4540f770d4
@@ -7,6 +7,7 @@
|
||||
organ_tag = O_EYES
|
||||
parent_organ = BP_HEAD
|
||||
var/list/eye_colour = list(0,0,0)
|
||||
var/innate_flash_protection = FLASH_PROTECTION_NONE
|
||||
|
||||
/obj/item/organ/internal/eyes/robotize()
|
||||
..()
|
||||
@@ -86,3 +87,9 @@
|
||||
if(prob(1))
|
||||
owner.custom_pain("Your eyes are watering, making it harder to see clearly for a moment.",1)
|
||||
owner.eye_blurry += 10
|
||||
|
||||
/obj/item/organ/internal/eyes/proc/get_total_protection(var/flash_protection = FLASH_PROTECTION_NONE)
|
||||
return (flash_protection + innate_flash_protection)
|
||||
|
||||
/obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity)
|
||||
return -1
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
var/gendered_icon = 0 // Whether or not the icon state appends a gender.
|
||||
var/s_tone // Skin tone.
|
||||
var/list/s_col // skin colour
|
||||
var/s_col_blend = ICON_ADD // How the skin colour is applied.
|
||||
var/list/h_col // hair colour
|
||||
var/body_hair // Icon blend for body hair if any.
|
||||
var/mob/living/applied_pressure
|
||||
|
||||
@@ -58,7 +58,7 @@ var/global/list/limb_icon_cache = list()
|
||||
if(owner.should_have_organ(O_EYES))
|
||||
var/obj/item/organ/internal/eyes/eyes = owner.internal_organs_by_name[O_EYES]
|
||||
if(eye_icon)
|
||||
var/icon/eyes_icon = new/icon('icons/mob/human_face.dmi', eye_icon)
|
||||
var/icon/eyes_icon = new/icon(eye_icon_location, eye_icon)
|
||||
if(eyes)
|
||||
eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD)
|
||||
else
|
||||
@@ -178,9 +178,10 @@ var/global/list/limb_icon_cache = list()
|
||||
else
|
||||
applying.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
|
||||
icon_cache_key += "_tone_[s_tone]"
|
||||
else if(s_col && s_col.len >= 3)
|
||||
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD)
|
||||
icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]"
|
||||
else
|
||||
if(s_col && s_col.len >= 3)
|
||||
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), s_col_blend)
|
||||
icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]_[s_col_blend]"
|
||||
|
||||
// Translucency.
|
||||
if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND
|
||||
|
||||
@@ -265,6 +265,8 @@
|
||||
force = 3
|
||||
throwforce = 7
|
||||
|
||||
var/eye_icon_location = 'icons/mob/human_face.dmi'
|
||||
|
||||
/obj/item/organ/external/head/robotize(var/company, var/skip_prosthetics, var/keep_organs)
|
||||
return ..(company, skip_prosthetics, 1)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user