Merge branch 'master' into upstream-merge-32624

code/__DEFINES/DNA.dm

@@ -127,15 +127,19 @@
 #define TOXINLOVER		24
 #define DIGITIGRADE		25	//Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
 #define NO_UNDERWEAR	26
-#define MUTCOLORS2		27
-#define MUTCOLORS3		28
-#define NOLIVER 		29
-#define NOSTOMACH		30
+#define NOLIVER 		27
+#define NOSTOMACH		28
+#define NO_DNA_COPY     29
+#define DRINKSBLOOD		30
+#define SPECIES_ORGANIC 31
+#define SPECIES_INORGANIC 32
+#define SPECIES_UNDEAD  33
+#define SPECIES_ROBOTIC 34
 //citadel code
-#define NOAROUSAL		29 //Stops all arousal effects
-#define NOGENITALS		30 //Cannot create, use, or otherwise have genitals
-#define NO_DNA_COPY     31
-#define DRINKSBLOOD		32
+#define MUTCOLORS2		35
+#define MUTCOLORS3		36
+#define NOAROUSAL		37 //Stops all arousal effects
+#define NOGENITALS		38 //Cannot create, use, or otherwise have genitals
 
 #define ORGAN_SLOT_BRAIN "brain"
 #define ORGAN_SLOT_APPENDIX "appendix"

code/__DEFINES/atom_hud.dm

@@ -16,31 +16,37 @@
 #define DIAG_BOT_HUD	"12"// Bot HUDs
 #define DIAG_TRACK_HUD	"13"// Mech tracking beacon
 #define DIAG_AIRLOCK_HUD "14"//Airlock shock overlay
+#define DIAG_PATH_HUD "15"//Bot path indicators
 //for antag huds. these are used at the /mob level
-#define ANTAG_HUD		"15"
+#define ANTAG_HUD		"16"
+
+//by default everything in the hud_list of an atom is an image
+//a value in hud_list with one of these will change that behavior
+#define HUD_LIST_LIST 1
 
 //data HUD (medhud, sechud) defines
 //Don't forget to update human/New() if you change these!
-#define DATA_HUD_SECURITY_BASIC		1
-#define DATA_HUD_SECURITY_ADVANCED	2
-#define DATA_HUD_MEDICAL_BASIC		3
-#define DATA_HUD_MEDICAL_ADVANCED	4
-#define DATA_HUD_DIAGNOSTIC			5
+#define DATA_HUD_SECURITY_BASIC			1
+#define DATA_HUD_SECURITY_ADVANCED		2
+#define DATA_HUD_MEDICAL_BASIC			3
+#define DATA_HUD_MEDICAL_ADVANCED		4
+#define DATA_HUD_DIAGNOSTIC_BASIC		5
+#define DATA_HUD_DIAGNOSTIC_ADVANCED	6
 //antag HUD defines
-#define ANTAG_HUD_CULT			6
-#define ANTAG_HUD_REV			7
-#define ANTAG_HUD_OPS			8
-#define ANTAG_HUD_WIZ			9
-#define ANTAG_HUD_SHADOW    	10
-#define ANTAG_HUD_TRAITOR 		11
-#define ANTAG_HUD_NINJA 		12
-#define ANTAG_HUD_CHANGELING 	13
-#define ANTAG_HUD_ABDUCTOR 		14
-#define ANTAG_HUD_DEVIL			15
-#define ANTAG_HUD_SINTOUCHED	16
-#define ANTAG_HUD_SOULLESS		17
-#define ANTAG_HUD_CLOCKWORK		18
-#define ANTAG_HUD_BROTHER		19
+#define ANTAG_HUD_CULT			7
+#define ANTAG_HUD_REV			8
+#define ANTAG_HUD_OPS			9
+#define ANTAG_HUD_WIZ			10
+#define ANTAG_HUD_SHADOW    	11
+#define ANTAG_HUD_TRAITOR 		12
+#define ANTAG_HUD_NINJA 		13
+#define ANTAG_HUD_CHANGELING 	14
+#define ANTAG_HUD_ABDUCTOR 		15
+#define ANTAG_HUD_DEVIL			16
+#define ANTAG_HUD_SINTOUCHED	17
+#define ANTAG_HUD_SOULLESS		18
+#define ANTAG_HUD_CLOCKWORK		19
+#define ANTAG_HUD_BROTHER		20
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/__DEFINES/components.dm

@@ -10,6 +10,11 @@
 #define COMPONENT_DUPE_ALLOWED 1    //duplicates allowed
 #define COMPONENT_DUPE_UNIQUE 2     //new component is deleted
 
+// Signal return value flags
+// The other defines are under the signal they're used in
+
+#define COMPONENT_ACTIVATED 1 // call parent.ComponentActivated(comp) and component.AfterComponentActivated()
+
 // All signals. Format:
 // When the signal is called: (signal arguments)
 
@@ -19,9 +24,11 @@
 #define COMSIG_PARENT_QDELETED "parent_qdeleted"				//before a datum's Destroy() is called: ()
 
 #define COMSIG_COMPONENT_CLEAN_ACT "clean_act"					//called on an object to clean it of cleanables. Usualy with soap: (num/strength)
+#define COMSIG_COMPONENT_NTNET_RECIEVE "ntnet_recieve"			//called on an object by its NTNET connection component on recieve. (sending_id(number), sending_netname(text), data(datum/netdata))
 
 // /atom signals
 #define COMSIG_PARENT_ATTACKBY "atom_attackby"			        //from base of atom/attackby(): (/obj/item, /mob/living, params)
+	#define COMPONENT_NO_AFTERATTACK 2								//Return this in response if you don't want afterattack to be called
 #define COMSIG_ATOM_HULK_ATTACK "hulk_attack"					//from base of atom/attack_hulk(): (/mob/living/carbon/human)
 #define COMSIG_PARENT_EXAMINE "atom_examine"                    //from base of atom/examine(): (/mob)
 #define COMSIG_ATOM_ENTERED "atom_entered"                      //from base of atom/Entered(): (/atom/movable, /atom)

code/__DEFINES/integrated_electronics.dm

@@ -20,6 +20,7 @@
 #define IC_FORMAT_BOOLEAN		"\<BOOL\>"
 #define IC_FORMAT_REF			"\<REF\>"
 #define IC_FORMAT_LIST			"\<LIST\>"
+#define IC_FORMAT_INDEX			"\<INDEX\>"
 
 #define IC_FORMAT_PULSE			"\<PULSE\>"
 
@@ -33,6 +34,7 @@
 #define IC_PINTYPE_BOOLEAN			/datum/integrated_io/boolean
 #define IC_PINTYPE_REF				/datum/integrated_io/ref
 #define IC_PINTYPE_LIST				/datum/integrated_io/lists
+#define IC_PINTYPE_INDEX			/datum/integrated_io/index
 
 #define IC_PINTYPE_PULSE_IN			/datum/integrated_io/activate
 #define IC_PINTYPE_PULSE_OUT		/datum/integrated_io/activate/out

code/__DEFINES/is_helpers.dm

@@ -59,6 +59,9 @@
 #define iszombie(A) (is_species(A, /datum/species/zombie))
 #define ishumanbasic(A) (is_species(A, /datum/species/human))
 
+//why arent catpeople a subspecies
+#define iscatperson(A) (ishumanbasic(A) && ( A.dna.features["ears"] == "Cat" || A.dna.features["human_tail"] == "Cat") )
+
 //more carbon mobs
 #define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
 
@@ -186,3 +189,5 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
 	/obj/item/stack/sheet/plasmarglass)))
 
 #define is_glass_sheet(O) (is_type_in_typecache(O, GLOB.glass_sheet_types))
+
+#define isblobmonster(O) (istype(O, /mob/living/simple_animal/hostile/blob))

code/__DEFINES/misc.dm

@@ -478,3 +478,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 
 #define SYRINGE_DRAW 0
 #define SYRINGE_INJECT 1
+
+//gold slime core spawning
+#define NO_SPAWN 0
+#define HOSTILE_SPAWN 1
+#define FRIENDLY_SPAWN 2

code/__DEFINES/networks.dm

@@ -0,0 +1 @@
+#define HID_RESTRICTED_END 101		//the first nonrestricted ID, automatically assigned on connection creation.

code/__DEFINES/reagents.dm

@@ -11,4 +11,9 @@
 #define INGEST 2 //ingestion
 #define VAPOR 3 //foam, spray, blob attack
 #define PATCH 4 //patches
-#define INJECT 5 //injection
+#define INJECT 5 //injection
+
+//defines passed through to the on_reagent_change proc
+#define DEL_REAGENT 1 //reagent deleted (fully cleared)
+#define ADD_REAGENT 2 // reagent added
+#define REM_REAGENT 3 // reagent removed (may still exist)

code/__DEFINES/say.dm

@@ -49,4 +49,10 @@
 #define LOGCHAT "chat"
 #define LOGASAY "adminsay"
 #define LOGCOMMENT "comment"
-#define LOGOOC "ooc"
+#define LOGOOC "ooc"
+
+
+#define LINGHIVE_NONE 0
+#define LINGHIVE_OUTSIDER 1
+#define LINGHIVE_LING 2
+#define LINGHIVE_LINK 3

code/__DEFINES/subsystems.dm

@@ -51,9 +51,10 @@
 #define INIT_ORDER_TICKER 13
 #define INIT_ORDER_MAPPING 12
 #define INIT_ORDER_ATOMS 11
-#define INIT_ORDER_LANGUAGE 10
-#define INIT_ORDER_MACHINES 9
-#define INIT_ORDER_CIRCUIT 8
+#define INIT_ORDER_NETWORKS 10
+#define INIT_ORDER_LANGUAGE 9
+#define INIT_ORDER_MACHINES 8
+#define INIT_ORDER_CIRCUIT 7
 #define INIT_ORDER_TIMER 1
 #define INIT_ORDER_DEFAULT 0
 #define INIT_ORDER_AIR -1
@@ -100,4 +101,4 @@
 			A.overlays.Cut();\
 		}\
 		A.flags_1 &= ~OVERLAY_QUEUED_1;\
-	}
+	}