Merge branch 'master' into plant-adding

code/__DEFINES/misc.dm

@@ -43,13 +43,13 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 #define GLOVES_LAYER			18
 #define EARS_LAYER				17
 #define BODY_TAUR_LAYER			16
-#define GENITALS_FRONT_LAYER	15
-#define SUIT_LAYER				14
-#define GLASSES_LAYER			13
-#define BELT_LAYER				12		//Possible make this an overlay of somethign required to wear a belt?
-#define SUIT_STORE_LAYER		11
-#define NECK_LAYER				10
-#define BACK_LAYER				9
+#define SUIT_LAYER				15
+#define GLASSES_LAYER			14
+#define BELT_LAYER				13		//Possible make this an overlay of somethign required to wear a belt?
+#define SUIT_STORE_LAYER		12
+#define NECK_LAYER				11
+#define BACK_LAYER				10
+#define GENITALS_FRONT_LAYER	9
 #define HAIR_LAYER				8		//TODO: make part of head layer?
 #define FACEMASK_LAYER			7
 #define HEAD_LAYER				6
@@ -260,6 +260,16 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_SKIN_ALT = 'icons/obj/pda_alt.dmi',
 								PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi'))
 
+//zippo icon reskins
+#define ZIPPO_SKIN_PLAIN "Plain"
+#define ZIPPO_SKIN_DAME "Dame"
+#define ZIPPO_SKIN_THIRTEEN "Thirteen"
+#define ZIPPO_SKIN_SNAKE "Snake"
+
+GLOBAL_LIST_INIT(lighter_reskins, list(ZIPPO_SKIN_PLAIN = "plain", ZIPPO_SKIN_DAME = "dame",
+								ZIPPO_SKIN_THIRTEEN = "thirteen", ZIPPO_SKIN_SNAKE = "snake"))
+
+
 /////////////////////////////////////
 // atom.appearence_flags shortcuts //
 /////////////////////////////////////

code/__DEFINES/mobs.dm

@@ -250,7 +250,8 @@
 #define POCKET_STRIP_DELAY			40	//time taken (in deciseconds) to search somebody's pockets
 #define DOOR_CRUSH_DAMAGE	15	//the amount of damage that airlocks deal when they crush you
 
-#define	HUNGER_FACTOR		0.1	//factor at which mob nutrition decreases
+#define	HUNGER_FACTOR		0.08	//factor at which mob nutrition decreases
+#define	THIRST_FACTOR		0.08	//factor at which mob thirst decreases
 #define	REAGENTS_METABOLISM 0.4	//How many units of reagent are consumed per tick, by default.
 #define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4)	// By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism
 

code/__DEFINES/reactions.dm

@@ -26,7 +26,8 @@
 //Research point amounts
 #define NOBLIUM_RESEARCH_AMOUNT				100
 #define BZ_RESEARCH_AMOUNT					15
-#define MIASMA_RESEARCH_AMOUNT				6		//lolno, fart gas 2 ez
+#define MIASMA_RESEARCH_AMOUNT				6
+#define PHEROMONE_RESEARCH_AMOUNT			6
 #define STIMULUM_RESEARCH_AMOUNT			50
 //Plasma fusion properties
 #define FUSION_ENERGY_THRESHOLD				3e9 	//Amount of energy it takes to start a fusion reaction

code/__DEFINES/subsystems.dm

@@ -64,6 +64,7 @@
 #define INIT_ORDER_TICKER			9
 #define INIT_ORDER_MAPPING			8
 #define INIT_ORDER_NETWORKS			7
+#define INIT_ORDER_ECONOMY			21
 #define INIT_ORDER_ATOMS			6
 #define INIT_ORDER_LANGUAGE			5
 #define INIT_ORDER_MACHINES			4

code/__DEFINES/traits.dm

@@ -94,6 +94,7 @@
 #define TRAIT_NOFIRE			"nonflammable"
 #define TRAIT_NOGUNS			"no_guns"
 #define TRAIT_NOHUNGER			"no_hunger"
+#define TRAIT_NOTHIRST			"no_thirst"
 #define TRAIT_EASYDISMEMBER		"easy_dismember"
 #define TRAIT_LIMBATTACHMENT 	"limb_attach"
 #define TRAIT_NOLIMBDISABLE		"no_limb_disable"
@@ -169,6 +170,7 @@
 #define	TRAIT_MUSICIAN			"musician"
 #define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
+#define TRAIT_DISTANT			"headpat_hater"
 //#define TRAIT_FLUID_LEAK	"leaky_fluids" removed because milk snail trails are not okay
 #define TRAIT_MASO              "masochism"
 #define TRAIT_CHOKE_SLUT		"choke_slut"