cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2014-09-29 00:39:43 +09:30
parent afdcb1f564 302d854514
commit 97801b4617
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -130,7 +130,6 @@ var/list/ai_verbs_default = list(
//Languages
add_language("Sol Common", 0)
add_language("Sinta'unathi", 0)
add_language("Siik'maas", 0)
add_language("Siik'tajr", 0)
add_language("Skrellian", 0)
add_language("Tradeband", 1)

4
code/modules/mob/living/silicon/pai/software.dm
View File

@@ -694,7 +694,6 @@
translator_on = 0
remove_language("Sinta'unathi")
remove_language("Siik'maas")
remove_language("Siik'tajr")
remove_language("Skrellian")
@@ -704,8 +703,7 @@
translator_on = 1
add_language("Sinta'unathi")
add_language("Siik'maas")
add_language("Siik'tajr", 0)
add_language("Siik'tajr")
add_language("Skrellian")
src << "\blue Translator Module toggled ON."

1
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -60,7 +60,6 @@
R.add_language("Sol Common", 1)
R.add_language("Tradeband", 1)
R.add_language("Sinta'unathi", 0)
R.add_language("Siik'maas", 0)
R.add_language("Siik'tajr", 0)
R.add_language("Skrellian", 0)
R.add_language("Gutter", 0)

6
code/modules/supermatter/supermatter.dm
View File

@@ -1,5 +1,5 @@
#define NITROGEN_RETARDATION_FACTOR 4 //Higher == N2 slows reaction more
#define NITROGEN_RETARDATION_FACTOR 0.15 //Higher == N2 slows reaction more
#define THERMAL_RELEASE_MODIFIER 750 //Higher == more heat released during reaction
#define PHORON_RELEASE_MODIFIER 1500 //Higher == less phoron released by reaction
#define OXYGEN_RELEASE_MODIFIER 1500 //Higher == less oxygen released at high temperature/power
@@ -181,7 +181,7 @@
removed = env.remove(gasefficency * env.total_moles) //Remove gas from surrounding area
if(!env || !removed || !removed.total_moles)
damage += max((power-(2*CRITICAL_TEMPERATURE*POWER_FACTOR))/10, 0) //exciting the supermatter in a vacuum means the internal energy is mostly locked inside.
damage += max((power - 15*POWER_FACTOR)/10, 0)
else if (grav_pulling) //If supermatter is detonating, remove all air from the zone
env.remove(env.total_moles)
else
@@ -190,7 +190,7 @@
damage = max( damage + min( ( (removed.temperature - CRITICAL_TEMPERATURE) / 150 ), damage_inc_limit ) , 0 )
//Ok, 100% oxygen atmosphere = best reaction
//Maxes out at 100% oxygen pressure
oxygen = max(min((removed.gas["oxygen"] - (removed.gas["nitrogen"] * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0)
oxygen = max(min((removed.gas["oxygen"] - (removed.gas["nitrogen"] * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles, 1), 0)
//calculate power gain for oxygen reaction
var/temp_factor