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

C02 -> carbon_dioxide

Browse Source 
Renamed carbon dioxide breathing type string to hopefully prevent
confusion in the future.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
This commit is contained in:
Mike
2014-05-29 20:17:51 -04:00
committed by ZomgPonies
parent bfd2cd036c
commit eff5baae08
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+6 -6
View File
@@ -526,7 +526,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
inhaling = breath.nitrogen
if("plasma")
inhaling = breath.toxins
if("C02")
if("carbon_dioxide")
inhaling = breath.carbon_dioxide
else
inhaling = breath.oxygen
@@ -536,13 +536,13 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
poison = breath.oxygen
if("nitrogen")
poison = breath.nitrogen
if("C02")
if("carbon_dioxide")
poison = breath.carbon_dioxide
else
poison = breath.toxins
switch(species.exhale_type)
if("C02")
if("carbon_dioxide")
exhaling = breath.carbon_dioxide
if("oxygen")
exhaling = breath.oxygen
@@ -585,9 +585,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
switch(species.breath_type)
if("nitrogen")
breath.nitrogen -= inhaled_gas_used
if("phoron")
if("plasma")
breath.toxins -= inhaled_gas_used
if("C02")
if("carbon_dioxide")
breath.carbon_dioxide-= inhaled_gas_used
else
breath.oxygen -= inhaled_gas_used
@@ -600,7 +600,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
breath.nitrogen += inhaled_gas_used
if("plamsa")
breath.toxins += inhaled_gas_used
if("C02")
if("carbon_dioxide")
breath.carbon_dioxide += inhaled_gas_used
// Too much exhaled gas in the air
code/modules/mob/living/carbon/species.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/breath_type = "oxygen" // Non-oxygen gas breathed, if any.
var/poison_type = "plasma" // Poisonous air.
var/exhale_type = "C02" // Exhaled gas type.
var/exhale_type = "carbon_dioxide" // Exhaled gas type.
var/cold_level_1 = 260 // Cold damage level 1 below this point.
var/cold_level_2 = 200 // Cold damage level 2 below this point.