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

Merge pull request #57 from alex-gh/map_fixes

Browse Source 
Map fixes
This commit is contained in:
ZomgPonies
2013-11-21 17:23:51 -08:00
parent 0faab50c64 24e9c1037d
commit 2afe9da24a
3 changed files with 5977 additions and 5981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Yinadele/Supermatter.dm
+1 -1
View File
@@ -1,6 +1,6 @@
#define NITROGEN_RETARDATION_FACTOR 4 //Higher == N2 slows reaction more
#define THERMAL_RELEASE_MODIFIER 10 //Higher == less heat released during reaction
#define THERMAL_RELEASE_MODIFIER 25 //Higher == less heat released during reaction
#define PLASMA_RELEASE_MODIFIER 1500 //Higher == less plasma released by reaction
#define OXYGEN_RELEASE_MODIFIER 750 //Higher == less oxygen released at high temperature/power
#define REACTION_POWER_MODIFIER 1.1 //Higher == more overall power
code/game/machinery/computer/store.dm
+3 -3
View File
@@ -146,13 +146,13 @@ td.cost.toomuch {
src.updateUsrDialog()
return
/obj/machinery/computer/cloning/update_icon()
/obj/machinery/computer/merch/update_icon()
if(stat & BROKEN)
icon_state = "comm_logs0"
icon_state = "comm_logsb"
else
if(stat & NOPOWER)
src.icon_state = "comm_logs"
src.icon_state = "comm_logs0"
stat |= NOPOWER
else
icon_state = initial(icon_state)