Conflict fixes

modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm

@@ -54,15 +54,15 @@
 		return..()
 
 	var/mob/living/carbon/human/H = M
-	var/obj/item/organ/genital/breasts/B = M.getorganslot(ORGAN_SLOT_BREASTS)
 	//If they've opted out, then route processing though liver.
 	if(!(H.client?.prefs.cit_toggles & BREAST_ENLARGEMENT))
 		var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
 		if(L)
-			L.swelling += 0.05
+			L.applyOrganDamage(0.25)
 		else
 			H.adjustToxLoss(1)
 		return..()
+	var/obj/item/organ/genital/breasts/B = M.getorganslot(ORGAN_SLOT_BREASTS)
 	//otherwise proceed as normal
 	if(!B) //If they don't have breasts, give them breasts.
 
@@ -95,7 +95,8 @@
 /datum/reagent/fermi/breast_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a female if male and ODing, doesn't touch nonbinary and object genders.
 	if(!(M.client?.prefs.cit_toggles & FORCED_FEM))
 		var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
-		L.swelling+= 0.05
+		if(L)
+			L.applyOrganDamage(0.25)
 		return ..()
 
 	var/obj/item/organ/genital/penis/P = M.getorganslot(ORGAN_SLOT_PENIS)
@@ -130,7 +131,8 @@
 	var/obj/item/organ/genital/breasts/B = M.getorganslot(ORGAN_SLOT_BREASTS)
 	if(!(M.client?.prefs.cit_toggles & BREAST_ENLARGEMENT) || !B)
 		var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
-		L.swelling-= 0.05
+		if(L)
+			L.applyOrganDamage(-0.25)
 		return ..()
 	B.modify_size(-0.05)
 	return ..()
@@ -208,14 +210,14 @@
 	if(!ishuman(M))
 		return ..()
 	var/mob/living/carbon/human/H = M
-	var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS)
 	if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT))
 		var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
 		if(L)
-			L.swelling += 0.05
+			L.applyOrganDamage(0.25)
 		else
 			H.adjustToxLoss(1)
 		return ..()
+	var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS)
 	//otherwise proceed as normal
 	if(!P)//They do have a preponderance for escapism, or so I've heard.
 
@@ -241,7 +243,8 @@
 		return ..()
 	if(!(M.client?.prefs.cit_toggles & FORCED_MASC))
 		var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
-		L.swelling+= 0.05
+		if(L)
+			L.applyOrganDamage(0.25)
 		return..()
 
 	var/obj/item/organ/genital/breasts/B = M.getorganslot(ORGAN_SLOT_BREASTS)
@@ -278,7 +281,8 @@
 	var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS)
 	if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT) || !P)
 		var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
-		L.swelling-= 0.05
+		if(L)
+			L.applyOrganDamage(-0.25)
 		return..()
 
 	P.modify_size(-0.1)

modular_citadel/code/modules/reagents/objects/items.dm

@@ -54,7 +54,6 @@
 		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 		add_fingerprint(user)
 		return
-	..()
 
 /obj/item/fermichem/pHpaper
 	name = "pH indicator strip"

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -95,6 +95,7 @@
 	taste_description = "strawberry roofies"
 	taste_mult = 2 //Hide the roofies in stronger flavors
 	color = "#FFADFF"//PINK, rgb(255, 173, 255)
+	can_synth = FALSE
 
 /datum/reagent/drug/aphrodisiac/on_mob_life(mob/living/M)
 	if(M && M.client?.prefs.arousable && !(M.client?.prefs.cit_toggles & NO_APHRO))
@@ -120,6 +121,7 @@
 	color = "#FF2BFF"//dark pink
 	addiction_threshold = 20
 	overdose_threshold = 20
+	can_synth = FALSE
 
 /datum/reagent/drug/aphrodisiacplus/on_mob_life(mob/living/M)
 	if(M && M.client?.prefs.arousable && !(M.client?.prefs.cit_toggles & NO_APHRO))
@@ -174,6 +176,7 @@
 	taste_mult = 2
 	color = "#D9D9D9"//rgb(217, 217, 217)
 	reagent_state = SOLID
+	can_synth = FALSE
 
 /datum/reagent/drug/anaphrodisiac/on_mob_life(mob/living/M)
 	if(M && M.client?.prefs.arousable && prob(16))
@@ -191,6 +194,7 @@
 	color = "#D9D9D9"//rgb(217, 217, 217)
 	reagent_state = SOLID
 	overdose_threshold = 20
+	can_synth = FALSE
 
 /datum/reagent/drug/anaphrodisiacplus/on_mob_life(mob/living/M)
 	if(M && M.client?.prefs.arousable)