Fix species radiation multipliers (#1325)

Fixes radiation so species' radiation_mod values are actually applied.
Refactored radiation application to use proc apply_radiation() instead of directly modifying the variable.
This commit is contained in:
Lohikar
2016-12-28 01:15:20 +02:00
committed by skull132
parent fbe0ea9c25
commit 982bf9b1a1
19 changed files with 56 additions and 41 deletions
+1 -1
View File
@@ -386,7 +386,7 @@
occupantData["uniqueEnzymes"] = connected.occupant.dna.unique_enzymes
occupantData["uniqueIdentity"] = connected.occupant.dna.uni_identity
occupantData["structuralEnzymes"] = connected.occupant.dna.struc_enzymes
occupantData["radiationLevel"] = connected.occupant.radiation
occupantData["radiationLevel"] = connected.occupant.total_radiation
data["occupant"] = occupantData;
data["isBeakerLoaded"] = connected.beaker ? 1 : 0
+1 -1
View File
@@ -317,7 +317,7 @@
"fireloss" = H.getFireLoss(),
"oxyloss" = H.getOxyLoss(),
"toxloss" = H.getToxLoss(),
"rads" = H.radiation,
"rads" = H.total_radiation,
"cloneloss" = H.getCloneLoss(),
"brainloss" = H.getBrainLoss(),
"paralysis" = H.paralysis,
+2 -2
View File
@@ -330,7 +330,7 @@
for(i=0,i<4,i++)
sleep(50)
if(src.OCCUPANT)
OCCUPANT.radiation += 50
OCCUPANT.apply_radiation(50)
if (!OCCUPANT.is_diona())
if(src.issuperUV)
var/burndamage = rand(28,35)
@@ -661,7 +661,7 @@
departments = list("Wizardry")
species = list("Human","Tajara","Skrell","Unathi")
can_repair = 1
/obj/machinery/suit_cycler/captain
name = "Captain suit cycler"
model_text = "Captain"
+2 -2
View File
@@ -1276,8 +1276,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
O.show_message("<span class='warning'>\The [user] has analyzed [C]'s radiation levels!</span>", 1)
user.show_message("<span class='notice'>Analyzing Results for [C]:</span>")
if(C.radiation)
user.show_message("<span class='notice'>Radiation Level: [C.radiation]</span>")
if(C.total_radiation)
user.show_message("<span class='notice'>Radiation Level: [C.total_radiation]</span>")
else
user.show_message("<span class='notice'>No radiation detected.</span>")