Fixes RND

2017-12-22 00:02:48 -08:00
parent a990811cee
commit a82d0e13ce
20 changed files with 556 additions and 374 deletions
@@ -334,9 +334,9 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #endif
 #endif

- // Consider these images/atoms as part of the UI/HUD
+// Consider these images/atoms as part of the UI/HUD
 #define APPEARANCE_UI_IGNORE_ALPHA			RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE
-#define APPEARANCE_UI								RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR
+#define APPEARANCE_UI						RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE

 //Just space
 #define SPACE_ICON_STATE	"[((x + y) ^ ~(x * y) + z) % 25]"
@@ -444,6 +444,7 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define GIBTONITE_ACTIVE 1
 #define GIBTONITE_STABLE 2
 #define GIBTONITE_DETONATE 3
+
 //for obj explosion block calculation
 #define EXPLOSION_BLOCK_PROC -1

@@ -452,8 +453,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define BEAT_SLOW 2
 #define BEAT_NONE 0

-#define BEAT_CHANNEL 150
-
 //http://www.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
 #define MOUSE_OPACITY_TRANSPARENT 0
 #define MOUSE_OPACITY_ICON 1
@@ -484,9 +483,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define SYRINGE_DRAW 0
 #define SYRINGE_INJECT 1

-#define RESEARCH_MATERIAL_RECLAMATION_ID "0"
-
-
 //gold slime core spawning
 #define NO_SPAWN 0
 #define HOSTILE_SPAWN 1
@@ -1,4 +1,8 @@

+#define RDCONSOLE_UI_MODE_NORMAL 1
+#define RDCONSOLE_UI_MODE_EXPERT 2
+#define RDCONSOLE_UI_MODE_LIST 3
+
 //RDSCREEN screens
 #define RDSCREEN_MENU 0
 #define RDSCREEN_TECHDISK 1
@@ -59,3 +63,5 @@
 //#define DEPARTMENTAL_FLAG_MINING 128

 #define DESIGN_ID_IGNORE "IGNORE_THIS_DESIGN"
+
+#define RESEARCH_MATERIAL_RECLAMATION_ID "__materials"