Merge pull request #6 from HLVU1/dev

general changes and fixes

Author: ComradeNiobe

code/__DEFINES/nutrition_n_water_def.dm

@@ -6,7 +6,7 @@
 #define THIRST_LEVEL_DEHYDRATED 50
 
 // Factor of how fast mob nutrition decreases
-#define HUNGER_FACTOR 0.18
+#define HUNGER_FACTOR 0.13
 
 // Factor of how fast mob thirst decreases
-#define THIRST_FACTOR 0.5
+#define THIRST_FACTOR 0.26

code/controllers/Processes/padla.dm

@@ -24,7 +24,7 @@ var/global/knifeprayer = FALSE
 
 /datum/padla/New()
 	..()
-	timeForNextPadla = rand(20 MINUTES, 35 MINUTES)
+	timeForNextPadla = rand(35 MINUTES, 45 MINUTES)
 
 /datum/padla/proc/process()
 	timeForNextPadla = max(0, timeForNextPadla-1 SECONDS)
@@ -42,7 +42,7 @@ var/global/knifeprayer = FALSE
 	if (padlas)
 		var/datum/curses/padla/chosenPadla = new padlas
 		chosenPadla.Curse()
-		timeForNextPadla = rand(20 MINUTES, 35 MINUTES)
+		timeForNextPadla = rand(35 MINUTES, 45 MINUTES)
 
 // PADLAS TYPE
 
@@ -65,7 +65,7 @@ var/global/knifeprayer = FALSE
 				to_chat(H, "<span class='horriblestate' style='font-size: 150%;'><b><i>Your Lust Intensifies!</i></b></span>")
 
 
-/datum/curses/padla/teeth
+/*/datum/curses/padla/teeth
 	name = "teeth padla"
 
 /datum/curses/padla/teeth/Curse()
@@ -91,7 +91,7 @@ var/global/knifeprayer = FALSE
 /datum/curses/padla/piss/Curse()
 	for(var/mob/living/carbon/human/H in player_list)
 		if(!H.check_perk(/datum/perk/ref/warlock) && !H.stat && !H.sleeping)
-			H.bladder = rand(450, 500)
+			H.bladder = rand(450, 500)*/
 
 /datum/curses/padla/famine
 	name = "famine padla"

code/game/jobs/job_controller.dm

@@ -62,7 +62,7 @@ var/global/thanatiWords = list()
 			if(!job)	return 0
 			if(jobban_isbanned(player, rank))	return 0
 			if(player.client.chromie_holder.chromie_number < 0 && rank == "Kraken") return 0
-			if(!donation_trap.Find(ckey(player.key)) || job.no_trapoc)
+			if(job.no_trapoc)
 				if(job.sex_lock && player.client.prefs.gender != job.sex_lock)
 					return 0
 			if(!job.player_old_enough(player.client)) return 0
@@ -114,7 +114,7 @@ var/global/thanatiWords = list()
 			if(flag && (!player.client.prefs.be_special & flag))
 				Debug("FOC flag failed, Player: [player], Flag: [flag], ")
 				continue
-			if(!donation_trap.Find(ckey(player.key)) || job.no_trapoc)
+			if(job.no_trapoc)
 				if(job.sex_lock && player.client.prefs.gender != job.sex_lock)
 					Debug("FOC character wrong gender, Player: [player]")
 					continue
@@ -156,7 +156,7 @@ var/global/thanatiWords = list()
 				Debug("GRJ player not old enough, Player: [player]")
 				continue
 
-			if(!tier_tiamat.Find(ckey(player.key)) || !donation_trap.Find(ckey(player.key)) || job.no_trapoc)
+			if(job.no_trapoc)
 				if(job.sex_lock && player.client.prefs.gender != job.sex_lock)
 					continue
 
@@ -374,8 +374,8 @@ var/global/thanatiWords = list()
 						Debug("DO isbanned failed, Player: [player], Job:[job.title]")
 						continue
 
-					if(!tier_tiamat.Find(ckey(player.key)) || !donation_trap.Find(ckey(player.key)))
-						if(job.sex_lock && job.sex_lock != player.client.prefs.gender)
+					if(job.no_trapoc)
+						if(job.sex_lock && player.client.prefs.gender != job.sex_lock)
 							Debug("DO player wrong gender, Player: [player], Job:[job.title]")
 							continue
 

code/modules/client/preferences.dm

@@ -319,7 +319,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 		var/rank = job.title
 		rank = job.title
 		lastJob = job
-		if((job.sex_lock && job.sex_lock != user.client.prefs.gender && (!donation_trap.Find(ckey(user.client.key)) || job.no_trapoc)) || job.flag == MIGRANT || job.flag == SIEGER || (job.total_positions == 0 && job.spawn_positions == 0))
+		if((job.no_trapoc && job.sex_lock && job.sex_lock != user.client.prefs.gender) || job.flag == MIGRANT || job.flag == SIEGER || (job.total_positions == 0 && job.spawn_positions == 0))
 			. += "<del>[rank]</del></td><td><b> \[UNAVAILABLE]</b></td></tr>"
 			continue
 		if(job.job_whitelisted)

code/modules/family/matchmaking.dm

@@ -139,7 +139,7 @@ var/list/client/set_spoused = list() //prevents set_spoused people from being sh
 
 //This is where the families are made.  This is basically the big driver of everything.
 /datum/matchmaker/proc/do_family_matchmaking()
-	var/total_familes = round(player_list.len * 0.2) + 1  // How many families we want Makes around 1 family per 4 people, and always at least one family
+	var/total_familes = round(player_list.len * 1)  // How many families we want Makes around 1 family per 4 people, and always at least one family
 	/*to_world("Trying to make families total_familes = [total_familes]")
 	for(var/mob/living/carbon/human/H in player_list)
 		to_world("player_list is [player_list]")

code/modules/mob/living/carbon/human/emote.dm

@@ -758,25 +758,26 @@
 				return
 			if(isChild(src))
 				return
+			if(src.doing_fuck)
+				return
 			if(src.mutilated_genitals)
 				return to_chat(src, "<span class='combatbold'>[pick(fnord)]</span><span class='combat'> I can't.</span>")
 			if(src.wear_suit)
 				return to_chat(src, "<span class='combatbold'>[pick(fnord)]</span><span class='combat'> I have clothes on.</span>")
 			if(src.w_uniform && !P.pants_down)
 				return to_chat(src, "<span class='combatbold'>[pick(fnord)]</span><span class='combat'> I have clothes on.</span>")
+			
+			src.doing_fuck = TRUE
+			
 			if(src.has_penis())
-				if(src.erpcooldown == 0)
-					if(src.penis_size > 0)
-						message = "<span class='examinebold'>[src]</span> <span class='examine'>[pick(nonolist)]</span>"
-						src.lust += 12
-						if (src.lust >= src.resistenza)
-							src.fakecum()
-							src.lust = 0
-						else
-							src.moan()
-						call_sound_emote("masturbate")
+				message = "<span class='examinebold'>[src]</span> <span class='examine'>[pick(nonolist)]</span>"
+				src.lust += 12
+				if (src.lust >= src.resistenza)
+					src.fakecum()
+					src.lust = 0
 				else
-					to_chat(src, "It's not erect...")
+					src.moan()
+				call_sound_emote("masturbate")
 			else
 				message = "<span class='examinebold'>[src]</span> <span class='examine'>[pick(femnonolist)]</span>"
 				src.lust += 12
@@ -785,6 +786,10 @@
 					src.lust = 0
 				else
 					src.moan()
+					
+			// Add cooldown reset with same timer (2 deciseconds)
+			spawn(2)
+				src.doing_fuck = FALSE
 
 //SHITTY EMOTES END
 

code/modules/mob/living/carbon/human/examine.dm

@@ -1,5 +1,3 @@
-
-
 /mob/verb/ZEPRETACO()
 	winset( src.client, "mapwindow.map", "zoom-mode=normal" )
 
@@ -71,11 +69,6 @@
 					t_chis = "Her"
 					t_him = "her"
 
-			if(has_penis() && (!wear_suit && is_nude()))
-				t_He = "He"
-				t_his = "his"
-				t_him = "him"
-
 		var/mob/living/carbon/human/M = user
 		var/mob/living/carbon/human/P = src
 		if(isStealth())

code/modules/mob/living/carbon/human/human.dm

@@ -778,37 +778,22 @@
 
 		else if (href_list["interaction"] == "anal")
 			if(get_dist(H,P) <= 1 && isnude_p && isnude && haspenis && hasanus_p)
-				if (H.erpcooldown == 0)
-					if (H.penis_size > 0)
-						H.fuck(H, P, "anal")
-				else
-					var/message = pick("it's not erect...")
-					to_chat(H, message)
+				if (H.penis_size > 0)
+					H.fuck(H, P, "anal")
+
 		else if (href_list["interaction"] == "vaginal")
 			if (get_dist(H,P) <= 1 && isnude_p && isnude && haspenis && hasanus_p)
-				if (H.erpcooldown == 0)
-					if (H.penis_size > 0)
-						H.fuck(H, P, "vaginal")
-				else
-					var/message = pick("It's not erect...")
-					to_chat(H, message)
+				if (H.penis_size > 0)
+					H.fuck(H, P, "vaginal")
 
 		else if (href_list["interaction"] == "oral")
 			if (get_dist(H,P) <= 1 && isnude && mouthfree_p && haspenis)
-				if (H.erpcooldown == 0)
-					if (H.penis_size > 0)
-						H.fuck(H, P, "oral")
-				else
-					var/message = pick("It's not erect...")
-					to_chat(H, message)
+				if (H.penis_size > 0)
+					H.fuck(H, P, "oral")
 
 		else if (href_list["interaction"] == "mount")
 			if (get_dist(H,P) <= 1 && isnude && isnude_p && haspenis_p && hasvagina)
-				if(P.erpcooldown == 0)
-					H.fuck(H, P, "mount")
-				else
-					var/message = pick("You have no lust now.")
-					to_chat(H, "<span class='erp'>[message]</span>")
+				H.fuck(H, P, "mount")
 
 
 

code/modules/mob/living/carbon/human/interactions.dm

@@ -405,7 +405,6 @@ var/list/cuckoldlist = list()
 		if (istype(P.loc, /obj/structure/closet))
 			P.visible_message("<span class='erpbold'>[H]</span> <span class='cumzone'>[message]</span>")
 		H.lust = 5
-		H.resistenza += 50
 		orgasms += 1
 		if(P.mind && H.mind && (!ismonster(H) && !H.bot && !istype(H, /mob/living/carbon/human/skinless) && P.stat != DEAD))
 			var/has_husband = FALSE
@@ -423,30 +422,20 @@ var/list/cuckoldlist = list()
 		H.visible_message("<span class='erpbold'>[H]</span> <span class='cumzone'>[message].</span>")
 		if (istype(P.loc, /obj/structure/closet))
 			P.visible_message("<span class='erpbold'>[H]</span> <span class='cumzone'>[message].</span>")
-		var/delta = pick(20, 30, 40, 50)
 		switch(lust)
 			if(0 to 150)
 				sound_path = "honk/sound/new/ACTIONS/VAGINA/SQUIRT/SHORT/"
 			if(150 to INFINITY)
 				sound_path = "honk/sound/new/ACTIONS/VAGINA/SQUIRT/LONG/"
 		sound = pick(flist("[sound_path]"))
-		src.lust -= delta
+		src.lust = 60
 		orgasms += 1
 
 	H.multiorgasms += 1
 	if (H.multiorgasms > H.penis_size / 3)
 		if (H.stamina_loss < P.penis_size * 4)
 			H.stamina_loss += H.penis_size * 0.5
 
-	if(!(H.reagents.has_reagent("hero_drops")))
-		if (H.stamina_loss > 100)
-			H.erpcooldown = 600
-		else
-			H.erpcooldown = rand(200, 450)
-
-	if(H.reagents.has_reagent("hero_drops"))
-		lust = 0
-
 	if(H.special == "dst")
 		H.dst_completed += 1
 
@@ -516,14 +505,6 @@ var/list/cuckoldlist = list()
 		src.add_event("adultmag", /datum/happiness_event/magazinepleasure)
 		if(src.has_vice("Voyeur"))
 			viceneed = 0
-	if(!(src.reagents.has_reagent("hero_drops")))
-		if (src.stamina_loss > 100)
-			src.erpcooldown = 600
-		else
-			src.erpcooldown = rand(200, 450)
-
-	if(src.reagents.has_reagent("hero_drops"))
-		lust = 0
 
 	if(sound && sound_path)
 		playsound(loc, "[sound_path][sound]", 90, 1, -5)
@@ -599,7 +580,6 @@ var/list/cuckoldlist = list()
 				sound = pick(flist("honk/sound/new/ACTIONS/MOUTH/SALIVA/"))
 				playsound(loc, ("honk/sound/new/ACTIONS/MOUTH/SALIVA/[sound]"), 90, 1, -5)
 
-			H.do_fucking_animation(P)
 
 		if("fingering")
 			if(chastity_check_P)
@@ -631,7 +611,6 @@ var/list/cuckoldlist = list()
 
 			sound = pick(flist("honk/sound/new/ACTIONS/VAGINA/TOUCH/"))
 			playsound(loc, ("honk/sound/new/ACTIONS/VAGINA/TOUCH/[sound]"), 90, 1, -5)
-			H.do_fucking_animation(P)
 
 		if("ballsuck")
 			message = pick("sucks [P]'s balls.", "licks [P]'s nuts.")
@@ -660,7 +639,6 @@ var/list/cuckoldlist = list()
 				else
 					P.moan()
 
-			H.do_fucking_animation(P)
 			playsound(loc, ("[sound_path][sound]"), 90, 1, -5)
 			if(prob(35))
 				sound = pick(flist("honk/sound/new/ACTIONS/MOUTH/SALIVA/"))
@@ -693,7 +671,6 @@ var/list/cuckoldlist = list()
 				else
 					P.moan()
 
-			H.do_fucking_animation(P)
 			playsound(loc, ("[sound_path][sound]"), 90, 1, -5)
 			if(prob(35))
 				sound = pick(flist("honk/sound/new/ACTIONS/MOUTH/SALIVA/"))
@@ -724,7 +701,6 @@ var/list/cuckoldlist = list()
 			if(prob(50))
 				sound = pick(flist("honk/sound/new/ACTIONS/PENIS/HANDJOB/"))
 				playsound(loc, "honk/sound/new/ACTIONS/PENIS/HANDJOB/[sound]", 90, 1, -5)
-			H.do_fucking_animation(P)
 			if (prob(P.penis_size))
 				H.visible_message("<span class='erpbold'>[H]</span> <span class='erp'>strokes</span> <B>[P]'s </span><span class='erp'> [pick("cock","dick","penis")] faster.</span>")
 
@@ -780,7 +756,6 @@ var/list/cuckoldlist = list()
 					P.cum(P, H)
 				else
 					P.moan(H.penis_size)
-			H.do_fucking_animation(P)
 			if(prob(75))
 				sound = pick(flist("honk/sound/new/ACTIONS/PENETRATION/"))
 				playsound(loc, "honk/sound/new/ACTIONS/PENETRATION/[sound]", 90, 1, -5)
@@ -824,7 +799,6 @@ var/list/cuckoldlist = list()
 					P.cum(P, H, "vagina")
 				else
 					P.moan(P.penis_size)
-			H.do_fucking_animation(P)
 			if(prob(75))
 				sound = pick(flist("honk/sound/new/ACTIONS/PENETRATION/"))
 				playsound(loc, "honk/sound/new/ACTIONS/PENETRATION/[sound]", 90, 1, -5)
@@ -860,7 +834,6 @@ var/list/cuckoldlist = list()
 					P.cum(P, H)
 				else
 					P.moan(H.penis_size)
-			H.do_fucking_animation(P)
 			sound = pick(flist("honk/sound/new/ACTIONS/BODY/COLLIDE/NAKED/"))
 			playsound(loc, "honk/sound/new/ACTIONS/BODY/COLLIDE/NAKED/[sound]", 90, 1, -5)
 
@@ -895,8 +868,7 @@ var/list/cuckoldlist = list()
 				sound_path = "honk/sound/new/ACTIONS/BLOWJOB/"
 			sound = pick(flist("[sound_path]"))
 			playsound(loc, "[sound_path][sound]", 90, 1, -5)
-			H.do_fucking_animation(P)
-	spawn(5)
+	spawn(2)
 		H.doing_fuck = FALSE
 
 
@@ -905,7 +877,7 @@ var/list/cuckoldlist = list()
 	if (species.name == "Human" || H.isFemboy())
 		if (prob(H.lust / H.resistenza * 65))
 			var/message = pick("moans", "moans in pleasure",)
-			H.visible_message("<span class='erpbold'>[H]</span> <span class='erp'>[message].</span:")
+			H.visible_message("<span class='erpbold'>[H]</span> <span class='erp'>[message].</span>")
 			var/g = H.gender == FEMALE ? "f" : "m"
 			var/moan = rand(1, 7)
 			if (moan == lastmoan)
@@ -940,10 +912,6 @@ var/list/cuckoldlist = list()
 		lastfucked = null
 		lfhole = ""
 		multiorgasms = 0
-	if (lust == 0)
-		erpcooldown -= 1
-	if (erpcooldown < 0)
-		erpcooldown = 0
 
 /mob/living/carbon/human/proc/do_fucking_animation(mob/living/carbon/human/P)
 	var/pixel_x_diff = 0
@@ -1100,7 +1068,6 @@ var/list/cuckoldlist = list()
 			else
 				M.moan()
 
-			user.do_fucking_animation(M)
 			playsound(loc, "honk/sound/interactions/bang[rand(4, 6)].ogg", 90, 0, -5)
 
 		else if (hole == "anus" && hasanus)
@@ -1122,8 +1089,6 @@ var/list/cuckoldlist = list()
 			else
 				M.moan()
 
-			user.do_fucking_animation(M)
-
 			var/sound = pick(flist("honk/sound/new/ACTIONS/PENETRATION/"))
 			playsound(loc, "honk/sound/new/ACTIONS/PENETRATION/[sound]", 90, 1, -5)
 
@@ -1170,7 +1135,7 @@ var/list/cuckoldlist = list()
 		user.rotate_plane()
 	else
 		to_chat(user, "<span class='passivebold'>[pick(src.thoughts)]</span>")
-		user.resistenza += 5
+		user.lust += 5
 
 
 #undef CONDOM_NONE