Merge branch 'master' into protRig

code/__defines/ZAS.dm

@@ -11,3 +11,5 @@
 #define ATMOS_PASS_NO			2	// Never blocks air or zones.
 #define ATMOS_PASS_DENSITY		3	// Blocks air and zones if density = TRUE, allows both if density = FALSE
 #define ATMOS_PASS_PROC			4	// Call CanZASPass() using c_airblock
+
+#define HAS_VALID_ZONE(T) (T.zone && !T.zone.invalid)

code/__defines/chemistry.dm

@@ -41,6 +41,7 @@
 #define CE_DARKSIGHT "darksight" // Gives perfect vision in dark
 
 #define REAGENTS_PER_SHEET 20
+#define REAGENTS_PER_ORE 20
 
 // Attached to CE_ANTIBIOTIC
 #define ANTIBIO_NORM	1

code/__defines/faction.dm

@@ -105,6 +105,7 @@
 #define FACTION_SWARMER "swarmer"
 #define FACTION_TEPPI "teppi"
 #define FACTION_TUNNELCLOWN "tunnelclown"
+#define FACTION_TURKEY "turkey"
 #define FACTION_WILD_ANIMAL "wild animal"
 #define FACTION_WOLFGIRL "wolfgirl"
 #define FACTION_WOLFTAUR "wolftaur"

code/__defines/items_clothing.dm

@@ -40,6 +40,9 @@
 #define ACCESSORY_SLOT_ARMOR_M  0x8000
 #define ACCESSORY_SLOT_HELM_C   0x10000 //24 bit - higher than 0x80000 will overflow
 
+#define ACCESSORY_SLOT_RING		0x20000	//rings, knuckledusters
+#define ACCESSORY_SLOT_WRIST	0x40000	//wristwatches, wrist PDA maybe?
+
 // Bitmasks for the /obj/item/var/flags_inv variable. These determine when a piece of clothing hides another, i.e. a helmet hiding glasses.
 // WARNING: The following flags apply only to the external suit!
 #define HIDEGLOVES      0x1

code/__defines/jobs.dm

@@ -201,6 +201,7 @@
 	#define JOB_ALT_CONSTRUCTION_ENGINEER "Construction Engineer"
 	#define JOB_ALT_ENGINEERING_CONTRACTOR "Engineering Contractor"
 	#define JOB_ALT_COMPUTER_TECHNICIAN "Computer Technician"
+	#define JOB_ALT_SALVAGE_TECHNICIAN "Salvage Technician"
 
 #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
 	// Atmospheric Technician alt titles