Merge pull request #387 from Jay-Sparrow/antags

Lewd Antag

modular_citadel/code/modules/arousal/arousal.dm

@@ -359,6 +359,12 @@
 			if(G.can_climax)
 				setArousalLoss(min_arousal)
 
+	//Hyper - antag code
+	if(src.mind.special_role == ROLE_LEWD_TRAITOR)
+		for(var/datum/objective/obj in src.mind.objectives)
+			if (L.mind == obj.target)
+				L.mind.sexed = TRUE //sexed
+				to_chat(src, "<span class='userlove'>You feel deep satisfaction with yourself.</span>")
 
 	if(impreg)
 		//Role them odds, only people with the dicks can send the chance to the person with the settings enabled at the momment.

modular_citadel/code/modules/client/preferences.dm

@@ -23,6 +23,9 @@
 	var/hound_sleeper = TRUE
 	var/cit_toggles = TOGGLES_CITADEL
 
+	//Hyper prefs
+	var/noncon = FALSE  //Definitely want this off by default
+
 	// stuff that was in base
 	max_save_slots = 20