cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moar armalis fixes

Browse Source
This commit is contained in:
ZomgPonies
2014-05-14 23:00:13 -04:00
parent 66d9ba3fb8
commit 5ffb4a15ed
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_spawning.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/proc/EquipRacialItems(mob/living/carbon/human/M)
if(istype(M,/mob/living/carbon/human/vox))
if(M.species.name == "Vox" || M.species.name == "Vox Armalis")
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/magboots/vox(M), slot_shoes) // REPLACE THESE WITH CODED VOX ALTERNATIVES.
M.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(M), slot_back)
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/vox/armalis/New(var/new_loc)
/mob/living/carbon/human/voxarmalis/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 && !istype(src,/mob/living/carbon/human/vox)) // Too little oxygen
if(O2_pp < safe_oxygen_min && (species != "Vox" || species != "Vox Armalis")) // 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 && istype(src,/mob/living/carbon/human/vox)) //Vox breathe nitrogen, not oxygen.
else if(Nitrogen_pp < safe_oxygen_min && (species == "Vox" || species == "Vox Armalis")) //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 && istype(src,/mob/living/carbon/human/vox)) //Oxygen is toxic to vox.
else if(O2_pp > vox_oxygen_max && (species == "Vox" || species == "Vox Armalis")) //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
+1 -1
View File
@@ -218,7 +218,7 @@
icobase = 'icons/mob/human_races/r_armalis.dmi'
deform = 'icons/mob/human_races/r_armalis.dmi'
language = "Vox-pidgin"
path = /mob/living/carbon/human/voxarmalis
warning_low_pressure = 50
hazard_low_pressure = 0
code/modules/mob/new_player/new_player.dm
+2
View File
@@ -388,6 +388,8 @@
new_character = new /mob/living/carbon/human/diona(loc)
if("Vox")
new_character = new /mob/living/carbon/human/vox(loc)
if("Vox Armalis")
new_character = new /mob/living/carbon/human/voxarmalis(loc)
if("Kidan")
new_character = new /mob/living/carbon/human/kidan(loc)
if("Grey")