Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/__DEFINES/DNA.dm

@@ -105,6 +105,7 @@
 #define MATRIXED		22	//if icon is color matrix'd
 #define SKINTONE		23	//uses skin tones
 #define HORNCOLOR		24
+#define WINGCOLOR		25
 
 //organ slots
 #define ORGAN_SLOT_BRAIN "brain"

code/__DEFINES/movespeed_modification.dm

@@ -33,4 +33,6 @@
 #define MOVESPEED_ID_SANITY								"MOOD_SANITY"
 
 #define MOVESPEED_ID_PRONE_DRAGGING                     "PRONE_DRAG"
-#define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"
+#define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"
+
+#define MOVESPEED_ID_TASED_STATUS						"TASED"

code/__DEFINES/robots.dm

@@ -50,3 +50,7 @@
 #define ASSEMBLY_THIRD_STEP     2
 #define ASSEMBLY_FOURTH_STEP    3
 #define ASSEMBLY_FIFTH_STEP     4
+
+
+//Checks to determine borg availability depending on the server's config. These are defines in the interest of reducing copypasta
+#define BORG_SEC_AVAILABLE (!CONFIG_GET(flag/disable_secborg) && GLOB.security_level >= CONFIG_GET(number/minimum_secborg_alert))

code/__DEFINES/status_effects.dm

@@ -44,6 +44,8 @@
 
 #define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping //the affected is asleep
 
+#define STATUS_EFFECT_TASED /datum/status_effect/electrode //the affected has been tased, preventing fine muscle control
+
 #define STATUS_EFFECT_PACIFY /datum/status_effect/pacify //the affected is pacified, preventing direct hostile actions
 
 #define STATUS_EFFECT_BELLIGERENT /datum/status_effect/belligerent //forces the affected to walk, doing damage if they try to run