itMerge branch 'master' of https://github.com/ParadiseSS13/Paradise into CultPassBug

code/__DEFINES/construction.dm

@@ -26,3 +26,22 @@
 //plastic flaps construction states
 #define PLASTIC_FLAPS_NORMAL 0
 #define PLASTIC_FLAPS_DETACHED 1
+
+//Material defines, for determining how much of a given material an item contains
+#define MAT_METAL			"$metal"
+#define MAT_GLASS			"$glass"
+#define MAT_SILVER			"$silver"
+#define MAT_GOLD			"$gold"
+#define MAT_DIAMOND			"$diamond"
+#define MAT_URANIUM			"$uranium"
+#define MAT_PLASMA			"$plasma"
+#define MAT_BANANIUM		"$bananium"
+#define MAT_TRANQUILLITE	"$tranquillite"
+#define MAT_TITANIUM		"$titanium"
+#define MAT_BIOMASS			"$biomass"
+//The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
+#define MINERAL_MATERIAL_AMOUNT 2000
+//The maximum size of a stack object.
+#define MAX_STACK_SIZE 50
+//maximum amount of cable in a coil
+#define MAXCOIL 30

code/__DEFINES/lighting.dm

@@ -3,7 +3,7 @@
 #define LIGHTING_HEIGHT 1 // height off the ground of light sources on the pseudo-z-axis, you should probably leave this alone
 
 #define LIGHTING_LAYER 10 // drawing layer for lighting overlays
-#define LIGHTING_ICON 'icons/effects/lighting_overlay.png' // icon used for lighting shading effects
+#define LIGHTING_ICON 'icons/effects/lighting_overlay.dmi' // icon used for lighting shading effects
 
 #define LIGHTING_ROUND_VALUE (1 / 128) //Value used to round lumcounts, values smaller than 1/255 don't matter (if they do, thanks sinking points), greater values will make lighting less precise, but in turn increase performance, VERY SLIGHTLY.
 

code/__DEFINES/machines.dm

@@ -15,8 +15,6 @@
  #define FILE_DRM      16  // Some files want to not be copied/moved.  This is them complaining that you tried.
  #define NETWORK_FAILURE  32
 
-#define MINERAL_MATERIAL_AMOUNT 2000 //The amount of materials you get from a sheet of mineral like iron/diamond/glass etc
-
 #define	IMPRINTER		1	//For circuits. Uses glass/chemicals.
 #define PROTOLATHE		2	//New stuff. Uses glass/metal/chemicals
 #define	AUTOLATHE		4	//Uses glass/metal only.

code/__DEFINES/misc.dm

@@ -162,20 +162,6 @@
 #define MIN_SUPPLIED_LAW_NUMBER 15
 #define MAX_SUPPLIED_LAW_NUMBER 50
 
-//Material defines
-#define MAT_METAL			"$metal"
-#define MAT_GLASS			"$glass"
-#define MAT_SILVER			"$silver"
-#define MAT_GOLD			"$gold"
-#define MAT_DIAMOND			"$diamond"
-#define MAT_URANIUM			"$uranium"
-#define MAT_PLASMA			"$plasma"
-#define MAT_BANANIUM		"$bananium"
-#define MAT_TRANQUILLITE	"$tranquillite"
-#define MAT_BIOMASS			"$biomass"
-
-#define MAX_STACK_SIZE 50
-
 //check_target_facings() return defines
 #define FACING_FAILED											0
 #define FACING_SAME_DIR											1

code/__DEFINES/sound.dm

@@ -2,14 +2,15 @@
 #define CHANNEL_LOBBYMUSIC 1024
 #define CHANNEL_ADMIN 1023
 #define CHANNEL_VOX 1022
-#define CHANNEL_HEARTBEAT 1021 //sound channel for heartbeats
-#define CHANNEL_BUZZ 1020
-#define CHANNEL_AMBIENCE 1019
+#define CHANNEL_JUKEBOX 1021
+#define CHANNEL_HEARTBEAT 1020 //sound channel for heartbeats
+#define CHANNEL_BUZZ 1019
+#define CHANNEL_AMBIENCE 1018
 
 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED
 
-#define CHANNEL_HIGHEST_AVAILABLE 1018
+#define CHANNEL_HIGHEST_AVAILABLE 1017
 
 
 #define SOUND_MINIMUM_PRESSURE 10