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

Merge pull request #694 from ArchieBeepBoop/improvements

Browse Source 
ATMOS Firelocks and more
This commit is contained in:
Dahlular
2020-11-21 22:54:02 -07:00
committed by GitHub
parent b1427f5b43 7a8fcf77d4
commit 6645e50dad
9 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/reactions.dm
+2 -2
View File
@@ -26,7 +26,7 @@
//Research point amounts
#define NOBLIUM_RESEARCH_AMOUNT 100
#define BZ_RESEARCH_AMOUNT 15
#define MIASMA_RESEARCH_AMOUNT 16
#define MIASMA_RESEARCH_AMOUNT 6 //lolno, fart gas 2 ez
#define STIMULUM_RESEARCH_AMOUNT 50
//Plasma fusion properties
#define FUSION_ENERGY_THRESHOLD 3e9 //Amount of energy it takes to start a fusion reaction
@@ -41,4 +41,4 @@
#define FUSION_RAD_MAX 2000
#define FUSION_RAD_COEFFICIENT (-1000)
#define FUSION_INSTABILITY_ENDOTHERMALITY 2
#define FUSION_MAXIMUM_TEMPERATURE 1e8
#define FUSION_MAXIMUM_TEMPERATURE 1e8
code/__DEFINES/traits.dm
+1 -1
View File
@@ -123,7 +123,7 @@
#define TRAIT_CALCIUM_HEALER "calcium_healer"
#define TRAIT_ALCOHOL_LIGHTWEIGHT "alcohol_lightweight" //Skyrat port
#define TRAIT_CURSED_BLOOD "cursed_blood" //Yo dawg I heard you like bloodborne references so I put a
#define TRAIT_RADRESONANCE "radioactive resonance" //Hyperstation edit
#define TRAIT_RADRESONANCE "radioactive_resonance" //Hyperstation edit
#define TRAIT_SWIMMING "swimming" //only applied by /datum/element/swimming, for checking
#define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"