Merge pull request #10011 from Arturlang/Bloodsuckers

Bloodsuckers, or, yknow, vampires.

code/__DEFINES/antagonists.dm

@@ -40,3 +40,19 @@
 #define NOT_DOMINATING			-1
 #define MAX_LEADERS_GANG		4
 #define INITIAL_DOM_ATTEMPTS	3
+
+//Bloodsucker defines
+// Bloodsucker related antag datums
+#define ANTAG_DATUM_BLOODSUCKER			/datum/antagonist/bloodsucker
+#define ANTAG_DATUM_VASSAL				/datum/antagonist/vassal
+//#define ANTAG_DATUM_HUNTER				/datum/antagonist/vamphunter   Disabled for now
+
+// BLOODSUCKER
+#define BLOODSUCKER_LEVEL_TO_EMBRACE	3
+#define BLOODSUCKER_FRENZY_TIME	25		// How long the vamp stays in frenzy.
+#define BLOODSUCKER_FRENZY_OUT_TIME	300	// How long the vamp goes back into frenzy.
+#define BLOODSUCKER_STARVE_VOLUME	5	// Amount of blood, below which a Vamp is at risk of frenzy.
+
+#define CAT_STRUCTURE	"Structures"
+
+#define MARTIALART_HUNTER "hunter-fu"

code/__DEFINES/atom_hud.dm

@@ -58,6 +58,7 @@
 #define ANTAG_HUD_SOULLESS		21
 #define ANTAG_HUD_CLOCKWORK		22
 #define ANTAG_HUD_BROTHER		23
+#define ANTAG_HUD_BLOODSUCKER   24
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/__DEFINES/role_preferences.dm

@@ -35,6 +35,8 @@
 #define ROLE_LAVALAND               "lavaland"
 #define ROLE_INTERNAL_AFFAIRS		"internal affairs agent"
 #define ROLE_GANG					"gangster"
+#define ROLE_BLOODSUCKER			"bloodsucker"
+//#define ROLE_MONSTERHUNTER			"monster hunter" Disabled for now
 
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
 //The gamemode specific ones are just so the gamemodes can query whether a player is old enough
@@ -60,7 +62,9 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_OVERTHROW = /datum/game_mode/overthrow,
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
 	ROLE_SENTIENCE,
-	ROLE_GANG = /datum/game_mode/gang
+	ROLE_GANG = /datum/game_mode/gang,
+	ROLE_BLOODSUCKER = /datum/game_mode/bloodsucker
+	//ROLE_MONSTERHUNTER Disabled for now
 ))
 
 //Job defines for what happens when you fail to qualify for any job during job selection

code/__DEFINES/status_effects.dm

@@ -46,7 +46,7 @@
 
 #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_TASED /datum/status_effect/no_combat_mode/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
 
@@ -83,6 +83,9 @@
 #define STATUS_EFFECT_BREASTS_ENLARGEMENT /datum/status_effect/chem/breast_enlarger //Applied slowdown due to the ominous bulk.
 
 #define STATUS_EFFECT_PENIS_ENLARGEMENT /datum/status_effect/chem/penis_enlarger //More applied slowdown, just like the above.
+
+#define STATUS_EFFECT_NO_COMBAT_MODE /datum/status_effect/no_combat_mode //Wont allow combat mode and will disable it
+#define STATUS_EFFECT_MESMERIZE /datum/status_effect/no_combat_mode/mesmerize //Just reskinned no_combat_mode
 /////////////
 // NEUTRAL //
 /////////////

code/__DEFINES/traits.dm

@@ -127,6 +127,12 @@
 #define TRAIT_ABDUCTOR_TRAINING "abductor-training"
 #define TRAIT_ABDUCTOR_SCIENTIST_TRAINING "abductor-scientist-training"
 #define TRAIT_SURGEON           "surgeon"
+#define TRAIT_COLDBLOODED		"coldblooded"	// Your body is literal room temperature. Does not make you immune to the temp.
+#define TRAIT_NONATURALHEAL		"nonaturalheal"	// Only Admins can heal you. NOTHING else does it unless it's given the god tag.
+#define TRAIT_NORUNNING			"norunning"		// You walk!
+#define TRAIT_NOMARROW			"nomarrow"		// You don't make blood, with chemicals or nanites.
+#define TRAIT_NOPULSE			"nopulse"		// Your heart doesn't beat.
+
 
  //non-mob traits
 #define TRAIT_PARALYSIS			"paralysis" //Used for limb-based paralysis, where replacing the limb will fix it