cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8803 from Zuhayr/dev-freeze

Browse Source 
Readds vox pariah.
This commit is contained in:
Chinsky
2015-04-11 04:21:13 +03:00
parent d4c9150db6 d70ea77c2d
commit c9fc94e1ff
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/gamemodes/heist/heist.dm
View File

@@ -114,7 +114,8 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
for(var/datum/organ/external/limb in vox.organs) for(var/datum/organ/external/limb in vox.organs)
limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT) limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
// Keep track of their stack. // Add and keep track of their stack.
new /datum/organ/internal/stack/vox(vox)
if(vox.internal_organs_by_name["stack"]) if(vox.internal_organs_by_name["stack"])
cortical_stacks |= vox.internal_organs_by_name["stack"] cortical_stacks |= vox.internal_organs_by_name["stack"]

5
code/modules/mob/living/carbon/human/species/outsider/vox.dm
View File

@@ -30,7 +30,7 @@
poison_type = "oxygen" poison_type = "oxygen"
siemens_coefficient = 0.2 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" blood_color = "#2299FC"
flesh_color = "#808D11" flesh_color = "#808D11"
@@ -47,8 +47,7 @@
"liver" = /datum/organ/internal/liver, "liver" = /datum/organ/internal/liver,
"kidneys" = /datum/organ/internal/kidney, "kidneys" = /datum/organ/internal/kidney,
"brain" = /datum/organ/internal/brain, "brain" = /datum/organ/internal/brain,
"eyes" = /datum/organ/internal/eyes, "eyes" = /datum/organ/internal/eyes
"stack" = /datum/organ/internal/stack/vox
) )
/datum/species/vox/get_random_name(var/gender) /datum/species/vox/get_random_name(var/gender)