Merge remote-tracking branch 'citadel/master' into mobility_flags

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

@@ -191,7 +191,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 		var/obj/item/organ/vocal_cords/Vc = M.getorganslot(ORGAN_SLOT_VOICE)
 		var/obj/item/organ/vocal_cords/nVc = new /obj/item/organ/vocal_cords/velvet
 		if(Vc)
-			Vc.Remove(M)
+			Vc.Remove()
 		nVc.Insert(M)
 		qdel(Vc)
 		to_chat(M, "<span class='notice'><i>You feel your vocal chords tingle you speak in a more charasmatic and sultry tone.</i></span>")
@@ -333,6 +333,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	..()
 
 /datum/reagent/fermi/proc/FallInLove(mob/living/carbon/Lover, mob/living/carbon/Love)
+	if(Lover.client?.prefs.cit_toggles & NEVER_HYPNO)
+		return // doesn't even give a message, it's just ignored
 	if(Lover.has_status_effect(STATUS_EFFECT_INLOVE))
 		to_chat(Lover, "<span class='warning'>You are already fully devoted to someone else!</span>")
 		return

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

@@ -94,7 +94,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 				//I seriously wonder if anyone will ever use this function.
 				if(M.getorganslot(ORGAN_SLOT_ZOMBIE))//sure, it "treats" it, but "you've" still got it. Doesn't always work as well; needs a ghost.
 					var/obj/item/organ/zombie_infection/ZI = M.getorganslot(ORGAN_SLOT_ZOMBIE)
-					ZI.Remove(M)
+					ZI.Remove()
 					ZI.Insert(SM)
 					log_game("FERMICHEM: [M] ckey: [M.key]'s zombie_infection has been transferred to their clone")
 

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

@@ -129,7 +129,7 @@
 		if(16)
 			T = M.getorganslot(ORGAN_SLOT_TONGUE)
 			var/obj/item/organ/tongue/nT = new /obj/item/organ/tongue/fluffy
-			T.Remove(M)
+			T.Remove()
 			nT.Insert(M)
 			T.moveToNullspace()//To valhalla
 			to_chat(M, "<span class='big warning'>Your tongue feels... weally fwuffy!!</span>")
@@ -152,7 +152,7 @@
 /datum/reagent/fermi/furranium/on_mob_delete(mob/living/carbon/M)
 	if(cached_purity < 0.95)//Only permanent if you're a good chemist.
 		nT = M.getorganslot(ORGAN_SLOT_TONGUE)
-		nT.Remove(M)
+		nT.Remove()
 		qdel(nT)
 		T.Insert(M)
 		to_chat(M, "<span class='notice'>You feel your tongue.... unfluffify...?</span>")

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

@@ -29,7 +29,7 @@
 				nT = new C.dna.species.mutanttongue()
 			else
 				nT = new()
-			T.Remove(C)
+			T.Remove()
 			qdel(T)
 			nT.Insert(C)
 			to_chat(C, "<span class='notice'>You feel your tongue.... unfluffify...?</span>")
@@ -57,7 +57,7 @@
 					T = new C.dna.species.mutanttongue()
 				else
 					T = new()
-				oT.Remove(C)
+				oT.Remove()
 				qdel(oT)
 				T.Insert(C)
 				to_chat(C, "<span class='notice'>You feel your tongue.... unfluffify...?</span>")

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -10,7 +10,7 @@
 	if(clear_conversion == REACTION_CLEAR_IMPURE | REACTION_CLEAR_INVERSE)
 		for(var/id in results)
 			var/datum/reagent/R = my_atom.reagents.has_reagent(id)
-			if(R.purity == 1)
+			if(!R || R.purity == 1)
 				continue
 
 			var/cached_volume = R.volume
@@ -25,7 +25,6 @@
 				my_atom.reagents.add_reagent(R.impure_chem, impureVol, FALSE, other_purity = 1)
 				R.cached_purity = R.purity
 				R.purity = 1
-	return
 
 //Called when temperature is above a certain threshold, or if purity is too low.
 /datum/chemical_reaction/proc/FermiExplode(datum/reagents/R0, var/atom/my_atom, volume, temp, pH, Exploding = FALSE)

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

@@ -71,7 +71,7 @@
 	if(!istype(cont))
 		return
 	if(used == TRUE)
-		to_chat(user, "<span class='warning'>[user] has already been used!</span>")
+		to_chat(user, "<span class='warning'>[src] has already been used!</span>")
 		return
 	if(!LAZYLEN(cont.reagents.reagent_list))
 		return
@@ -107,6 +107,7 @@
 		if(-INFINITY to 1)
 			color = "#c6040c"
 	desc += " The paper looks to be around a pH of [round(cont.reagents.pH, 1)]"
+	name = "used [name]"
 	used = TRUE
 
 /obj/item/fermichem/pHmeter

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

@@ -1,7 +1,7 @@
 //body bluids
 /datum/reagent/consumable/semen
 	name = "Semen"
-	description = "Sperm from some animal. I bet you'll drink this out of a bucket someday."
+	description = "Sperm from some animal. Useless for anything but insemination, really."
 	taste_description = "something salty"
 	taste_mult = 2 //Not very overpowering flavor
 	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
@@ -32,15 +32,15 @@
 	icon_state = "semen1"
 	random_icon_states = list("semen1", "semen2", "semen3", "semen4")
 
-/obj/effect/decal/cleanable/semen/New()
-	..()
-	dir = pick(1,2,4,8)
+/obj/effect/decal/cleanable/semen/Initialize(mapload)
+	. = ..()
+	dir = GLOB.cardinals
 	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/semen/replace_decal(obj/effect/decal/cleanable/semen/S)
 	if(S.blood_DNA)
-		blood_DNA |= S.blood_DNA.Copy()
-	..()
+		blood_DNA |= S.blood_DNA
+	return ..()
 
 /datum/reagent/consumable/femcum
 	name = "Female Ejaculate"
@@ -65,15 +65,15 @@
 	blood_state = null
 	bloodiness = null
 
-/obj/effect/decal/cleanable/femcum/New()
-	..()
-	dir = pick(1,2,4,8)
+/obj/effect/decal/cleanable/femcum/Initialize(mapload)
+	. = ..()
+	dir = GLOB.cardinals
 	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/femcum/replace_decal(obj/effect/decal/cleanable/femcum/F)
 	if(F.blood_DNA)
-		blood_DNA |= F.blood_DNA.Copy()
-	..()
+		blood_DNA |= F.blood_DNA
+	return ..()
 
 /datum/reagent/consumable/femcum/reaction_turf(turf/T, reac_volume)
 	if(!istype(T))