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

ACTUALLY Resolves The Merge Conflicts (Remember To Save, Kids)

Browse Source
This commit is contained in:
SamCroswell
2016-07-11 13:06:40 -04:00
parent d79302ede6
commit 963ca2ca79
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/genetics.dm
-3
View File
@@ -122,12 +122,9 @@
#define NUTRITION_LEVEL_FED 350
#define NUTRITION_LEVEL_HUNGRY 250
#define NUTRITION_LEVEL_STARVING 150
<<<<<<< HEAD
=======
//Used for calculations for negative effects of having genetics powers
#define DEFAULT_GENE_STABILITY 100
#define GENE_INSTABILITY_MINOR 5
#define GENE_INSTABILITY_MODERATE 10
#define GENE_INSTABILITY_MAJOR 15
>>>>>>> 26e13f270f62f6104106ed087a318469ad4d9d02