cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 23:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

oh god here we go

Browse Source
This commit is contained in:
Aurorablade
2017-12-03 23:03:56 -05:00
parent 0e5b074029
commit 203e998640
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/surgery/organs/organ_internal.dm
View File

@@ -297,7 +297,6 @@
var/eye_colour = "#000000"
var/list/colourmatrix = null
var/list/colourblind_matrix = MATRIX_GREYSCALE //Special colourblindness parameters. By default, it's black-and-white.
var/colourblind_darkview = null
var/dependent_disabilities = null //Gets set by eye-dependent disabilities such as colourblindness so the eyes can transfer the disability during transplantation.
var/dark_view = 2 //Default dark_view for Humans.
var/weld_proof = null //If set, the eyes will not take damage during welding. eg. IPC optical sensors do not take damage when they weld things while all other eyes will.
@@ -312,9 +311,6 @@
return colourmatrix
/obj/item/organ/internal/eyes/proc/get_dark_view() //Returns dark_view (if the eyes are organic) for see_invisible handling in species.dm to be autoprocessed by life().
if(!robotic && colourblind_darkview && owner.disabilities & COLOURBLIND) //Returns special darkview value if colourblind and it exists, otherwise reuse current.
return colourblind_darkview
else
return dark_view
/obj/item/organ/internal/eyes/insert(mob/living/carbon/human/M, special = 0)

2
code/modules/surgery/organs/subtypes/grey.dm
View File

@@ -17,5 +17,5 @@
/obj/item/organ/internal/eyes/grey
name = "grey eyeballs"
dark_view = 5
dark_view = 3
species = "Grey"

10
code/modules/surgery/organs/subtypes/tajaran.dm
View File

@@ -2,12 +2,16 @@
alcohol_intensity = 1.4
species = "Tajaran"
/obj/item/organ/internal/eyes/tajaran /*Most Tajara see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
/obj/item/organ/internal/eyes/tajaran
name = "tajaran eyeballs"
species = "Tajaran"
dark_view = 8
/obj/item/organ/internal/eyes/tajaran/cblind //Most Tajara see in full colour as a result of genetic augmentation.
name = "unmodified tajaran eyeballs"
species = "Tajaran"
colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
colourblind_darkview = 8
dark_view = 8
/obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness.
name = "farwa eyeballs"

2
code/modules/surgery/organs/subtypes/unathi.dm
View File

@@ -4,5 +4,5 @@
/obj/item/organ/internal/eyes/unathi
name = "unathi eyeballs"
dark_view = 3
dark_view = 5
species = "Unathi"

11
code/modules/surgery/organs/subtypes/vulpkanin.dm
View File

@@ -2,12 +2,17 @@
alcohol_intensity = 1.4
species = "Vulpkanin"
/obj/item/organ/internal/eyes/vulpkanin /*Most Vulpkanin see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
/obj/item/organ/internal/eyes/vulpkanin
name = "vulpkanin eyeballs"
species = "Vulpkanin"
dark_view = 8
/obj/item/organ/internal/eyes/vulpkanin/cblind //Most Vulpkanin see in full colour as a result of genetic augmentation.
name = "unmodified vulpkanin eyeballs"
species = "Vulpkanin"
colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
colourblind_darkview = 8
dark_view = 8
/obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness.
name = "wolpin eyeballs"