cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing up vox and vox armalis gear

Browse Source
This commit is contained in:
ZomgPonies
2014-05-14 22:24:34 -04:00
parent 188593e452
commit 66d9ba3fb8
15 changed files with 12771 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -29,7 +29,7 @@
h_style = "Short Vox Quills"
..(new_loc, "Vox")
/mob/living/carbon/human/voxarmalis/New(var/new_loc)
/mob/living/carbon/human/vox/armalis/New(var/new_loc)
h_style = "Bald"
..(new_loc, "Vox Armalis")
code/modules/mob/living/carbon/human/life.dm
+3 -3
View File
@@ -488,7 +488,7 @@
// Nitrogen, for Vox.
var/Nitrogen_pp = (breath.nitrogen/breath.total_moles())*breath_pressure
if(O2_pp < safe_oxygen_min && species.name != "Vox") // Too little oxygen
if(O2_pp < safe_oxygen_min && !istype(src,/mob/living/carbon/human/vox)) // Too little oxygen
if(prob(20))
spawn(0) emote("gasp")
if(O2_pp > 0)
@@ -506,7 +506,7 @@
oxyloss += 5*ratio
oxygen_used = breath.oxygen*ratio/6
oxygen_alert = max(oxygen_alert, 1)*/
else if(Nitrogen_pp < safe_oxygen_min && species.name == "Vox") //Vox breathe nitrogen, not oxygen.
else if(Nitrogen_pp < safe_oxygen_min && istype(src,/mob/living/carbon/human/vox)) //Vox breathe nitrogen, not oxygen.
if(prob(20))
spawn(0) emote("gasp")
@@ -551,7 +551,7 @@
if(reagents)
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 && species.name == "Vox") //Oxygen is toxic to vox.
else if(O2_pp > vox_oxygen_max && istype(src,/mob/living/carbon/human/vox)) //Oxygen is toxic to vox.
var/ratio = (breath.oxygen/vox_oxygen_max) * 1000
adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
toxins_alert = max(toxins_alert, 1)
code/modules/mob/living/carbon/species.dm
+5
View File
@@ -209,6 +209,7 @@
uniform_icons = 'icons/mob/species/vox/uniform.dmi'
shoes_icons = 'icons/mob/species/vox/shoes.dmi'
wear_mask_icons = 'icons/mob/species/vox/mask.dmi'
flags = NO_SCAN | IS_WHITELISTED | NO_BLOOD
@@ -242,6 +243,10 @@
tail = "armalis_tail"
wear_mask_icons = 'icons/mob/species/vox/armalis/mask.dmi'
shoes_icons = 'icons/mob/species/vox/armalis/shoes.dmi'
gloves_icons = 'icons/mob/species/vox/armalis/hands.dmi'
/datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H)
H.verbs += /mob/living/carbon/human/proc/gut
..()