Fixing merge errors.

Testmerge ready.
2019-06-14 21:55:17 +01:00
parent 3700e1c7cd
commit 7a66039f0c
18 changed files with 57 additions and 59 deletions
@@ -304,7 +304,7 @@
 	var/breastCheck = FALSE
 	var/willyCheck = FALSE
 	if(!canbearoused)
-		add_trait(TRAIT_PHARMA)//Prefs prevent unwanted organs.
+		ADD_TRAIT(src, TRAIT_PHARMA, "pharma")//Prefs prevent unwanted organs.
 		return
 	for(var/obj/item/organ/O in internal_organs)
 		if(istype(O, /obj/item/organ/genital))
@@ -264,7 +264,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 		creatorName = chosen.real_name
 		creator = get_mob_by_key(creatorID)
 		*/
-	M.add_trait(TRAIT_PACIFISM, "MKUltra")
+	ADD_TRAIT(M, TRAIT_PACIFISM, "MKUltra")
 	var/datum/status_effect/chem/enthrall/E
 	if (!M.has_status_effect(/datum/status_effect/chem/enthrall))
 		M.apply_status_effect(/datum/status_effect/chem/enthrall)
@@ -313,7 +313,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 		log_game("FERMICHEM: [M] ckey: [M.key] has temporarily fallen for [love] ckey: [love.key]")
 	else
 		if(get_dist(M, love) < 8)
-			if(M.has_trait(TRAIT_NYMPHO)) //Add this back when merged/updated.
+			if(HAS_TRAIT(M, TRAIT_NYMPHO)) //Add this back when merged/updated.
 				M.adjustArousalLoss(5)
 			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "InLove", /datum/mood_event/InLove)
 			SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "MissingLove")
@@ -125,7 +125,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 					switch(current_cycle)
 						if(21)
 							to_chat(M, "<span class='notice'>The cells fail to catalyse around a nucleation event, instead merging with your cells.</span>") //This stuff is hard enough to make to rob a user of some benefit. Shouldn't replace Rezadone as it requires the user to not only risk making a player controlled clone, but also requires them to have split in two (which also requires 30u of SGDF).
-							M.remove_trait(TRAIT_DISFIGURED, TRAIT_GENERIC)
+							REMOVE_TRAIT(M, TRAIT_DISFIGURED, TRAIT_GENERIC)
 							log_game("FERMICHEM: [M] ckey: [M.key] is being healed by SDGF")
 						if(22 to INFINITY)
 							M.adjustCloneLoss(-1, 0)
@@ -64,10 +64,10 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
 	antiGenetics = 255
 	..()

-//Okay so, this might seem a bit too good, but my counterargument is that it'll likely take all round to eventually kill you this way, then you have to be revived without a body. It takes approximately 60-80 minutes to die from this.
+//Okay so, this might seem a bit too good, but my counterargument is that it'll likely take all round to eventually kill you this way, then you have to be revived without a body. It takes approximately 50-80 minutes to die from this.
 /datum/reagent/fermi/astral/addiction_act_stage1(mob/living/carbon/M)
 	if(addiction_stage < 2)
-		antiGenetics = 255//Doesn't reset when you take more, which is weird for me, it should.
+		antiGenetics = 255
 		M.alpha = 255 //Antigenetics is to do with stopping geneticists from turning people invisible to kill them.
 	if(prob(65))
 		M.alpha--
@@ -94,7 +94,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
 			to_chat(M, "<span class='notice'>You feel a substantial part of your soul flake off into the ethereal world, rendering yourself unclonable.</b></span>")
 			M.alpha--
 			antiGenetics--
-			M.add_trait(TRAIT_NOCLONE) //So you can't scan yourself, then die, to metacomm. You can only use your memories if you come back as something else.
+			ADD_TRAIT(M, TRAIT_NOCLONE, "astral") //So you can't scan yourself, then die, to metacomm. You can only use your memories if you come back as something else.
 		if(80)
 			to_chat(M, "<span class='notice'>You feel a thrill shoot through your body as what's left of your mind contemplates your forthcoming oblivion.</b></span>")
 			M.alpha--
@@ -68,7 +68,7 @@
 	if(!B) //If they don't have breasts, give them breasts.

 		//If they have Acute hepatic pharmacokinesis, then route processing though liver.
-		if(M.has_trait(TRAIT_PHARMA))
+		if(HAS_TRAIT(M, TRAIT_PHARMA))
 			var/obj/item/organ/liver/L = M.getorganslot("liver")
 			L.swelling+= 0.05
 			return..()
@@ -103,7 +103,7 @@
 /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.

 	//Acute hepatic pharmacokinesis.
-	if(M.has_trait(TRAIT_PHARMA))
+	if(HAS_TRAIT(M, TRAIT_PHARMA))
 		var/obj/item/organ/liver/L = M.getorganslot("liver")
 		L.swelling+= 0.05
 		return ..()
@@ -144,7 +144,7 @@
 	var/obj/item/organ/genital/breasts/B = M.getorganslot("breasts")
 	if(!B)
 		//Acute hepatic pharmacokinesis.
-		if(M.has_trait(TRAIT_PHARMA))
+		if(HAS_TRAIT(M, TRAIT_PHARMA))
 			var/obj/item/organ/liver/L = M.getorganslot("liver")
 			L.swelling-= 0.05
 			return ..()
@@ -207,7 +207,7 @@
 	if(!P)//They do have a preponderance for escapism, or so I've heard.

 		//If they have Acute hepatic pharmacokinesis, then route processing though liver.
-		if(M.has_trait(TRAIT_PHARMA))
+		if(HAS_TRAIT(M, TRAIT_PHARMA))
 			var/obj/item/organ/liver/L = M.getorganslot("liver")
 			L.swelling+= 0.05
 			return..()
@@ -235,7 +235,7 @@

 /datum/reagent/fermi/penis_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders.
 	//Acute hepatic pharmacokinesis.
-	if(M.has_trait(TRAIT_PHARMA))
+	if(HAS_TRAIT(M, TRAIT_PHARMA))
 		var/obj/item/organ/liver/L = M.getorganslot("liver")
 		L.swelling+= 0.05
 		return..()
@@ -275,7 +275,7 @@
 	var/obj/item/organ/genital/penis/P = H.getorganslot("penis")
 	if(!P)
 		//Acute hepatic pharmacokinesis.
-		if(M.has_trait(TRAIT_PHARMA))
+		if(HAS_TRAIT(M, TRAIT_PHARMA))
 			var/obj/item/organ/liver/L = M.getorganslot("liver")
 			L.swelling-= 0.05
 			return..()
@@ -401,7 +401,7 @@
 	H.moveToNullspace()
 	log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.")
 	//Just to deal with rascally ghosts
-	catto.add_trait(TRAIT_NODEATH, "catto")
+	ADD_TRAIT(catto, TRAIT_NODEATH, "catto")

 /datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
 	if(catto.health <= 50)