diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 80e58110e4..099443ade4 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -517,9 +517,7 @@ client/proc/one_click_antag()
new_vox.mind.assigned_role = "MODE"
new_vox.mind.special_role = "Vox Raider"
- //Adds them to current traitor list. Which is really the extra antagonist list.
ticker.mode.traitors += new_vox.mind
new_vox.equip_vox_raider()
- usr << "\red Returning vox."
return new_vox
\ No newline at end of file
diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm
index 4aa9b323a9..93f6af6eb5 100644
--- a/code/modules/admin/verbs/vox_raiders.dm
+++ b/code/modules/admin/verbs/vox_raiders.dm
@@ -5,8 +5,8 @@
equip_to_slot_or_del(R, slot_ears)
equip_to_slot_or_del(new /obj/item/clothing/under/vox/vox_robes(src), slot_w_uniform)
- equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(src), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
- equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves) // AS ABOVE.
+ equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(src), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
+ equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow/vox(src), slot_gloves) // AS ABOVE.
switch(rand(1,4)) // Come up with a better way of doing this - ticker of some sort maybe.
if(1) // Vox raider!
diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm
index 3a8824e644..c17f1b5aea 100644
--- a/code/modules/clothing/spacesuits/alien.dm
+++ b/code/modules/clothing/spacesuits/alien.dm
@@ -104,4 +104,56 @@
desc = "Weird and flowing!"
icon_state = "vox-casual-2"
color = "vox-casual-2"
- item_state = "vox-casual-2"
\ No newline at end of file
+ item_state = "vox-casual-2"
+
+/obj/item/clothing/gloves/yellow/vox
+ desc = "These bizarre gauntlets seem to be fitted for... bird claws?"
+ name = "insulated gauntlets"
+ icon_state = "gloves-vox"
+ item_state = "gloves-vox"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+ color="gloves-vox"
+
+/obj/item/clothing/gloves/yellow/vox/mob_can_equip(M as mob, slot)
+ var/mob/living/carbon/human/U = M
+ if(U.dna.mutantrace != "vox")
+ U << "This clearly isn't designed for your species!"
+ return 0
+ return ..()
+
+/obj/item/clothing/shoes/magboots/vox
+
+ desc = "A pair of heavy, jagged armoured foot pieces, seemingly suitable for a velociraptor."
+ name = "vox boots"
+ item_state = "boots-vox"
+ icon_state = "boots-vox"
+
+ toggle()
+ name = "Toggle Floor Grip"
+
+ if(src.magpulse)
+ src.flags &= ~NOSLIP
+ src.magpulse = 0
+ usr << "You relax your deathgrip on the flooring."
+ else
+ src.flags |= NOSLIP
+ src.magpulse = 1
+ usr << "You dig your claws deeply into the flooring, bracing yourself."
+
+
+ examine()
+ set src in view()
+ ..()
+ var/state = "loosely"
+ if(src.flags&NOSLIP)
+ state = "tightly"
+ usr << "The wearer seems to be gripping the floor [state]."
+
+
+/obj/item/clothing/shoes/magboots/vox/mob_can_equip(M as mob, slot)
+ var/mob/living/carbon/human/U = M
+ if(U.dna.mutantrace != "vox")
+ U << "This clearly isn't designed for your species!"
+ return 0
+ return ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 5d8dc1055b..0db1f949c5 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -470,7 +470,7 @@
reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
toxins_alert = max(toxins_alert, 1)
else if(O2_pp > vox_oxygen_max && src.dna.mutantrace=="vox") //Oxygen is toxic to vox.
- var/ratio = (breath.oxygen/vox_oxygen_max) * 10
+ var/ratio = (breath.oxygen/vox_oxygen_max) * 1000
adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
toxins_alert = max(toxins_alert, 1)
else
@@ -490,7 +490,7 @@
if( (abs(310.15 - breath.temperature) > 50) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
if(status_flags & GODMODE) return 1 //godmode
- if(breath.temperature < 260.15)
+ if(breath.temperature < 260.15 && dna.mutantrace != "vox") //Vox are resistant to cold.
if(prob(20))
src << "\red You feel your face freezing and an icicle forming in your lungs!"
else if(breath.temperature > 360.15)
@@ -501,10 +501,10 @@
if(-INFINITY to 120)
apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
- if(120 to 200)
+ if(120 to 200 && dna.mutantrace != "vox") //Vox are resistant to cold.
apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
- if(200 to 260)
+ if(200 to 260 && dna.mutantrace != "vox") //Vox are resistant to cold.
apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
fire_alert = max(fire_alert, 1)
if(360 to 400)
@@ -602,7 +602,7 @@
if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
pressure_alert = -1
else
- if( !(COLD_RESISTANCE in mutations) && src.dna.mutantrace!="vox")
+ if( !(COLD_RESISTANCE in mutations) && src.dna.mutantrace!="vox") //Vox are resistant to pressure loss.
adjustBruteLoss( LOW_PRESSURE_DAMAGE )
pressure_alert = -2
else
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 9f3660eb7c..4f2ab37106 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -81,7 +81,7 @@
if (is_speaking_tajaran)
return "mrowls, \"[text]\"";
if (is_speaking_vox)
- return "chirps, \"[text]\"";
+ return "shrieks, \"[text]\"";
//Needs Virus2
// if (src.disease_symptoms & DISEASE_HOARSE)
// return "rasps, \"[text]\"";
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 81c7532304..d994f6a63c 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 44dfaabf47..6e2862349b 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 9a8ee374dd..8160eefd31 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 6134bd6068..66f08d71d4 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ