Merge branch 'master' into fuckatmos

code/__DEFINES/antagonists.dm

@@ -35,3 +35,8 @@
 
 //Overthrow time to update heads obj
 #define OBJECTIVE_UPDATING_TIME 300
+
+//Gangshit
+#define NOT_DOMINATING			-1
+#define MAX_LEADERS_GANG		3
+#define INITIAL_DOM_ATTEMPTS	3

code/__DEFINES/citadel_defines.dm

@@ -33,8 +33,8 @@
 #define BALLS_VOLUME_MULT	1
 
 #define BALLS_SIZE_MIN		1
-#define BALLS_SIZE_DEF	3
-#define BALLS_SIZE_MAX		7
+#define BALLS_SIZE_DEF		2
+#define BALLS_SIZE_MAX		3
 
 #define BALLS_SACK_SIZE_MIN 1
 #define BALLS_SACK_SIZE_DEF	8

code/__DEFINES/components.dm

@@ -142,8 +142,9 @@
 #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"					//from base of mob/living/carbon/soundbang_act(): (list(intensity))
 
 // /obj signals
-#define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct"				//from base of obj/deconstruct(): (disassembled)
-#define COMSIG_OBJ_SETANCHORED "obj_setanchored"				//called in /obj/structure/setAnchored(): (value)
+#define COMSIG_OBJ_DECONSTRUCT 	"obj_deconstruct"				//from base of obj/deconstruct(): (disassembled)
+#define COMSIG_OBJ_BREAK		"obj_break"						//from base of /obj/obj_break(): (damage_flag)
+#define COMSIG_OBJ_SETANCHORED 	"obj_setanchored"				//called in /obj/structure/setAnchored(): (value)
 
 // /obj/item signals
 #define COMSIG_ITEM_ATTACK "item_attack"						//from base of obj/item/attack(): (/mob/living/target, /mob/living/user)

code/__DEFINES/role_preferences.dm

@@ -33,7 +33,8 @@
 #define ROLE_DRONE                  "drone"
 #define ROLE_DEATHSQUAD             "deathsquad"
 #define ROLE_LAVALAND               "lavaland"
-#define ROLE_INTERNAL_AFFAIRS	"internal affairs agent"
+#define ROLE_INTERNAL_AFFAIRS		"internal affairs agent"
+#define ROLE_GANG					"gangster"
 
 //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
@@ -58,7 +59,8 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
 	ROLE_OVERTHROW = /datum/game_mode/overthrow,
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
-	ROLE_SENTIENCE
+	ROLE_SENTIENCE,
+	ROLE_GANG = /datum/game_mode/gang
 ))
 
 //Job defines for what happens when you fail to qualify for any job during job selection

code/__DEFINES/traits.dm

@@ -71,6 +71,8 @@
 #define	TRAIT_MUSICIAN			"musician"
 #define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
+#define TRAIT_MASO              "masochism"
+#define TRAIT_ASSBLASTUSA       "assblastusa"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"