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

Merge pull request #8787 from Rykka-Stormheart/shep-dev-fbp-fix

Browse Source 
Fix incoming merge conflicts with PR #8757
This commit is contained in:
Verkister
2020-08-21 14:34:49 +03:00
committed by GitHub
parent 170b9a7513 16da38037d
commit 0732a01f17
3 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_powers.dm
+1 -9
View File
@@ -218,25 +218,17 @@
if(isSynthetic())
output += "Current Battery Charge: [nutrition]\n"
<<<<<<< HEAD
for(var/obj/item/organ/external/EO in organs)
if(EO.brute_dam || EO.burn_dam)
output += "[EO.name] - <span class='warning'>[EO.burn_dam + EO.brute_dam > EO.min_broken_damage ? "Heavy Damage" : "Light Damage"]</span>\n" //VOREStation Edit - Makes robotic limb damage scalable
else
output += "[EO.name] - <span style='color:green;'>OK</span>\n"
=======
if(isSynthetic())
var/toxDam = getToxLoss()
if(toxDam)
output += "System Instability: <span class='warning'>[toxDam > 25 ? "Severe" : "Moderate"]</span>. Seek charging station for cleanup.\n"
else
output += "System Instability: <span style='color:green;'>OK</span>\n"
>>>>>>> 85d1338... FBP Internal Components (#7445)
for(var/obj/item/organ/external/EO in organs)
if(EO.robotic >= ORGAN_ASSISTED)
if(EO.brute_dam || EO.burn_dam)
output += "[EO.name] - <span class='warning'>[EO.burn_dam + EO.brute_dam > ROBOLIMB_REPAIR_CAP ? "Heavy Damage" : "Light Damage"]</span>\n"
output += "[EO.name] - <span class='warning'>[EO.burn_dam + EO.brute_dam > EO.min_broken_damage ? "Heavy Damage" : "Light Damage"]</span>\n" //VOREStation Edit - Makes robotic limb damage scalable
else
output += "[EO.name] - <span style='color:green;'>OK</span>\n"
code/modules/mob/living/carbon/human/life.dm
+3 -9
View File
@@ -784,19 +784,13 @@
if (species.body_temperature == null)
return //this species doesn't have metabolic thermoregulation
<<<<<<< HEAD
// FBPs will overheat, prosthetic limbs are fine.
if(robobody_count)
if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF heatsinks
bodytemperature += round(robobody_count*1.75)
=======
// FBPs will overheat when alive, prosthetic limbs are fine.
if(stat != DEAD && robobody_count)
bodytemperature += round(robobody_count*1.15)
if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF heatsinks prevent the base heat increase per tick if installed.
bodytemperature += round(robobody_count*1.15)
var/obj/item/organ/internal/robotic/heatsink/HS = internal_organs_by_name[O_HEATSINK]
if(!HS || HS.is_broken())
if(!HS || HS.is_broken()) // However, NIF Heatsinks will not compensate for a core FBP component (your heatsink) being lost.
bodytemperature += round(robobody_count*0.5)
>>>>>>> 85d1338... FBP Internal Components (#7445)
var/body_temperature_difference = species.body_temperature - bodytemperature
code/modules/organs/robolimbs.dm
+1 -5
View File
@@ -51,12 +51,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
var/skin_tone // If set, applies skin tone rather than part color Overrides color.
var/skin_color // If set, applies skin color rather than part color.
var/blood_color = "#030303"
<<<<<<< HEAD
var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_XENOCHIMERA) //VOREStation Edit
=======
var/blood_name = "oil"
var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA)
>>>>>>> 85d1338... FBP Internal Components (#7445)
var/list/species_cannot_use = list(SPECIES_TESHARI, SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_XENOCHIMERA) //VOREStation Edit
var/list/species_alternates = list(SPECIES_TAJ = "Unbranded - Tajaran", SPECIES_UNATHI = "Unbranded - Unathi") //"Species Name" = "Robolimb Company" , List, when initialized, will become "Species Name" = RobolimbDatum, used for alternate species sprites.
var/list/monitor_styles //If empty, the model of limbs offers a head compatible with monitors.
var/parts = BP_ALL //Defines what parts said brand can replace on a body.