cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loop of metal usage due to mismatch in values

Browse Source
This commit is contained in:
Arokha Sieyes
2018-04-14 12:20:50 -04:00
parent be50f394a6
commit 84bbfcc787
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
View File

@@ -1,4 +1,5 @@
#define DAM_SCALE_FACTOR 0.01 #define DAM_SCALE_FACTOR 0.01
#define METAL_PER_TICK 150
/datum/species/protean /datum/species/protean
name = "Protean" name = "Protean"
name_plural = "Proteans" name_plural = "Proteans"
@@ -170,15 +171,15 @@
if(refactory && !(refactory.status & ORGAN_DEAD)) if(refactory && !(refactory.status & ORGAN_DEAD))
//MHydrogen adds speeeeeed //MHydrogen adds speeeeeed
if(refactory.get_stored_material("mhydrogen") >= 100) if(refactory.get_stored_material("mhydrogen") >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/mhydrogen, origin = refactory) H.add_modifier(/datum/modifier/protean/mhydrogen, origin = refactory)
//Plasteel adds brute armor //Plasteel adds brute armor
if(refactory.get_stored_material("plasteel") >= 100) if(refactory.get_stored_material("plasteel") >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/plasteel, origin = refactory) H.add_modifier(/datum/modifier/protean/plasteel, origin = refactory)
//Diamond adds burn armor //Diamond adds burn armor
if(refactory.get_stored_material("diamond") >= 100) if(refactory.get_stored_material("diamond") >= METAL_PER_TICK)
H.add_modifier(/datum/modifier/protean/diamond, origin = refactory) H.add_modifier(/datum/modifier/protean/diamond, origin = refactory)
return ..() return ..()
@@ -207,7 +208,7 @@
// Various modifiers // Various modifiers
/datum/modifier/protean /datum/modifier/protean
stacks = MODIFIER_STACK_FORBID stacks = MODIFIER_STACK_FORBID
var/material_use = 150 var/material_use = METAL_PER_TICK
var/material_name = DEFAULT_WALL_MATERIAL var/material_name = DEFAULT_WALL_MATERIAL
/datum/modifier/protean/on_applied() /datum/modifier/protean/on_applied()
@@ -303,3 +304,4 @@
desc += "\nVALID THROUGH END OF: [time2text(world.timeofday, "Month") +" "+ num2text(text2num(time2text(world.timeofday, "YYYY"))+544)]\nREGISTRANT: [new_name]" desc += "\nVALID THROUGH END OF: [time2text(world.timeofday, "Month") +" "+ num2text(text2num(time2text(world.timeofday, "YYYY"))+544)]\nREGISTRANT: [new_name]"
#undef DAM_SCALE_FACTOR #undef DAM_SCALE_FACTOR
#undef METAL_PER_TICK