mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-07-19 19:12:31 +01:00
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
poison_type = "oxygen"
|
||||
siemens_coefficient = 0.2
|
||||
|
||||
flags = IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
|
||||
flags = CAN_JOIN | IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
|
||||
|
||||
blood_color = "#2299FC"
|
||||
flesh_color = "#808D11"
|
||||
@@ -47,8 +47,7 @@
|
||||
"liver" = /obj/item/organ/liver,
|
||||
"kidneys" = /obj/item/organ/kidneys,
|
||||
"brain" = /obj/item/organ/brain,
|
||||
"eyes" = /obj/item/organ/eyes,
|
||||
"stack" = /obj/item/organ/stack/vox
|
||||
"eyes" = /obj/item/organ/eyes
|
||||
)
|
||||
|
||||
/datum/species/vox/get_random_name(var/gender)
|
||||
|
||||
Reference in New Issue
Block a user