Vox Rework (#12343)

This commit is contained in:
Fox McCloud
2019-09-20 17:58:59 -07:00
committed by variableundefined
parent c0a11d2f37
commit 593c18cb42
8 changed files with 24 additions and 54 deletions
+1 -1
View File
@@ -100,7 +100,7 @@
return
//Process infections
if(is_robotic() || sterile || (owner && (IS_PLANT in owner.dna.species.species_traits)))
if(is_robotic() || sterile || (owner && (NO_GERMS in owner.dna.species.species_traits)))
germ_level = 0
return
@@ -331,7 +331,7 @@ Note that amputating the affected organ does in fact remove the infection from t
*/
/obj/item/organ/external/proc/update_germs()
if(is_robotic() || (IS_PLANT in owner.dna.species.species_traits)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
if(is_robotic() || (NO_GERMS in owner.dna.species.species_traits)) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
germ_level = 0
return
+9 -34
View File
@@ -2,53 +2,28 @@
name = "vox liver"
icon = 'icons/obj/species_organs/vox.dmi'
alcohol_intensity = 1.6
/obj/item/organ/internal/stack
name = "cortical stack"
icon = 'icons/obj/species_organs/vox.dmi'
icon_state = "cortical-stack"
parent_organ = "head"
organ_tag = "stack"
slot = "vox_stack"
status = ORGAN_ROBOT
vital = TRUE
var/stackdamaged = FALSE
/obj/item/organ/internal/stack/on_life()
if(damage < 1 && stackdamaged)
owner.mutations.Remove(SCRAMBLED)
owner.dna.SetSEState(SCRAMBLEBLOCK,0)
genemutcheck(owner,SCRAMBLEBLOCK,null,MUTCHK_FORCED)
stackdamaged = FALSE
..()
/obj/item/organ/internal/stack/emp_act(severity)
if(owner)
owner.mutations.Add(SCRAMBLED)
owner.dna.SetSEState(SCRAMBLEBLOCK,1,1)
genemutcheck(owner,SCRAMBLEBLOCK,null,MUTCHK_FORCED)
owner.AdjustConfused(4)
if(!stackdamaged)
stackdamaged = TRUE
..()
sterile = TRUE
/obj/item/organ/internal/eyes/vox
name = "vox eyeballs"
icon = 'icons/obj/species_organs/vox.dmi'
sterile = TRUE
/obj/item/organ/internal/heart/vox
name = "vox heart"
icon = 'icons/obj/species_organs/vox.dmi'
sterile = TRUE
/obj/item/organ/internal/brain/vox
name = "cortical stack"
desc = "A peculiarly advanced bio-electronic device that seems to hold the memories and identity of a Vox."
icon = 'icons/obj/species_organs/vox.dmi'
desc = "A brain with spikes on top of it. It has some odd metallic slot with wires on the side."
icon_state = "brain2"
icon_state = "cortical-stack"
mmi_icon = 'icons/obj/species_organs/vox.dmi'
mmi_icon_state = "mmi_full"
sterile = TRUE
/obj/item/organ/internal/kidneys/vox
name = "vox kidneys"
icon = 'icons/obj/species_organs/vox.dmi'
icon = 'icons/obj/species_organs/vox.dmi'
sterile = TRUE