Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MOREDOTS

code/__DEFINES/construction.dm

@@ -18,6 +18,11 @@
 #define RWALL_SUPPORT_RODS 5
 #define RWALL_SHEATH 6
 
+//airlock assembly construction states
+#define AIRLOCK_ASSEMBLY_NEEDS_WIRES 0
+#define AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS 1
+#define AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER 2
+
 //plastic flaps construction states
 #define PLASTIC_FLAPS_NORMAL 0
 #define PLASTIC_FLAPS_DETACHED 1

code/__DEFINES/hud.dm

@@ -26,6 +26,11 @@
 #define PLANT_PEST_HUD		"21"// Pest level
 #define PLANT_WEED_HUD		"22"// Weed level
 #define DIAG_TRACK_HUD		"23"// Mech tracking beacon
+#define DIAG_PATH_HUD 		"24"//Bot path indicators
+
+//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!
@@ -34,20 +39,21 @@
 #define DATA_HUD_MEDICAL_BASIC		3
 #define DATA_HUD_MEDICAL_ADVANCED	4
 #define DATA_HUD_DIAGNOSTIC			5
-#define DATA_HUD_HYDROPONIC			6
+#define DATA_HUD_DIAGNOSTIC_ADVANCED	6
+#define DATA_HUD_HYDROPONIC			7
 //NATIONS
-#define GAME_HUD_NATIONS	7
+#define GAME_HUD_NATIONS	8
 //antag HUD defines
-#define ANTAG_HUD_CULT		8
-#define ANTAG_HUD_REV		9
-#define ANTAG_HUD_OPS		10
-#define ANTAG_HUD_WIZ		11
-#define ANTAG_HUD_SHADOW    12
-#define ANTAG_HUD_TRAITOR 13
-#define ANTAG_HUD_NINJA 14 //For Daves Rework
-#define ANTAG_HUD_CHANGELING 15
-#define ANTAG_HUD_VAMPIRE 16
-#define ANTAG_HUD_ABDUCTOR 17 //For Fox
+#define ANTAG_HUD_CULT		9
+#define ANTAG_HUD_REV		10
+#define ANTAG_HUD_OPS		11
+#define ANTAG_HUD_WIZ		12
+#define ANTAG_HUD_SHADOW    13
+#define ANTAG_HUD_TRAITOR 14
+#define ANTAG_HUD_NINJA 15
+#define ANTAG_HUD_CHANGELING 16
+#define ANTAG_HUD_VAMPIRE 17
+#define ANTAG_HUD_ABDUCTOR 18
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/__DEFINES/is_helpers.dm

@@ -5,6 +5,11 @@
 // Mobs
 #define ismegafauna(A) istype(A, /mob/living/simple_animal/hostile/megafauna)
 
+//Simple animals
+#define isshade(A) (istype(A, /mob/living/simple_animal/shade))
+
+#define isconstruct(A) (istype(A, /mob/living/simple_animal/hostile/construct))
+
 //Objects
 
 #define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable

code/__DEFINES/misc.dm

@@ -362,4 +362,4 @@
 #define BLOOD_STATE_NOT_BLOODY		"no blood whatsoever"
 
 // The SQL version required by this version of the code
-#define SQL_VERSION 1
+#define SQL_VERSION 2