Todo: finish new words and review langauge

2019-08-28 22:22:10 +01:00
parent 7a0afda173
commit a605d2a776
6 changed files with 30 additions and 37 deletions
@@ -130,8 +130,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
 */

 /datum/reagent/fermi/enthrall
-	name = "Politi-aid"
-	id = "politi-aid"
+	name = "enthrall"
+	id = "enthrall"
 	description = "A forbidden deep purple mixture that aids the political influence of creator upon the subject. When taken by the creator, it will enhance the power of their words to those affected by it."
 	color = "#660055"
 	taste_description = "politics"
@@ -143,6 +143,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	var/creatorGender
 	var/creatorName
 	var/mob/living/creator
+	var/political = TRUE
 	pH = 10
 	OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
 	can_synth = FALSE
@@ -176,16 +177,21 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	description = "A forbidden deep red mixture that overwhelms a foreign body with waves of pleasure, intoxicating them into servitude. When taken by the creator, it will enhance the draw of their voice to those affected by it."
 	color = "#660015" // rgb: , 0, 255
 	taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
+	political = FALSE


 /datum/reagent/fermi/enthrall/mkultra/on_mob_add(mob/living/carbon/M)
 	if(M.client?.prefs.lewdchem)
 		..()

-/datum/reagent/fermi/enthrall/on_mob_life(mob/living/carbon/M)
+/datum/reagent/fermi/enthrall/mkultra/on_mob_life(mob/living/carbon/M)
 	if(M.client?.prefs.lewdchem)
 		..()

+/datum/reagent/fermi/enthrall/politi
+	name = "Politi-aid"
+	id = "politi-aid"
+
 /datum/reagent/fermi/enthrall/on_mob_add(mob/living/carbon/M)
 	. = ..()
 	if(!ishuman(M))//Just to make sure screwy stuff doesn't happen.
@@ -212,7 +218,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 			Vc.Remove(M)
 		nVc.Insert(M)
 		qdel(Vc)
-		to_chat(M, "<span class='notice'><i>You feel your vocal chords tingle as your voice comes out in a more sultry tone.</span>")
+		to_chat(M, "<span class='notice'><i>[(political?"You feel your vocal chords tingle as your voice turns charasmatic.":" comes out in a more sultry tone.")]</span>")
 	else
 		log_game("FERMICHEM: MKUltra: [creatorName], [creatorID], is enthralling [M.name], [M.ckey]")
 		M.apply_status_effect(/datum/status_effect/chem/enthrall)
@@ -272,22 +278,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	if (M.ckey == creatorID && creatorName == M.real_name)//If the creator drinks 100u, then you get the status for someone random (They don't have the vocal chords though, so it's limited.)
 		if (!M.has_status_effect(/datum/status_effect/chem/enthrall))
 			to_chat(M, "<span class='love'><i>You are unable to resist your own charms anymore, and become a full blown narcissist.</i></span>")
-		/*Old way of handling, left in as an option B
-		var/list/seen = viewers(7, get_turf(M))//Sound and sight checkers
-		for(var/mob/living/carbon/victim in seen)
-			if(victim == M)//as much as I want you to fall for beepsky, he doesn't have a ckey
-				seen = seen - victim
-			if(!victim.ckey)
-				seen = seen - victim
-		var/mob/living/carbon/chosen = pick(seen)
-		creatorID = chosen.ckey
-		if (chosen.gender == "female")
-			creatorGender = "Mistress"
-		else
-			creatorGender = "Master"
-		creatorName = chosen.real_name
-		creator = get_mob_by_key(creatorID)
-		*/
 	ADD_TRAIT(M, TRAIT_PACIFISM, "MKUltra")
 	var/datum/status_effect/chem/enthrall/E
 	if (!M.has_status_effect(/datum/status_effect/chem/enthrall))
@@ -46,9 +46,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	var/unitCheck = FALSE
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	taste_description = "a weird chemical fleshy flavour"
-	//var/datum/status_effect/chem/SDGF/candidates/candies
 	var/list/candies = list()
-	//var/polling = FALSE
 	var/list/result = list()
 	var/list/group = null
 	var/pollStarted = FALSE
@@ -214,7 +212,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 /datum/reagent/fermi/SDGFheal
 	name = "synthetic-derived growth factor"
 	id = "SDGFheal"
-	metabolization_rate = 1
+	metabolization_rate = 0.8
 	can_synth = FALSE

 /datum/reagent/fermi/SDGFheal/on_mob_life(mob/living/carbon/M)//Used to heal the clone after splitting, the clone spawns damaged. (i.e. insentivies players to make more than required, so their clone doesn't have to be treated)
@@ -244,7 +242,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	id = "SDZF"
 	description = "A horribly peverse mass of Embryonic stem cells made real by the hands of a failed chemist. This message should never appear, how did you manage to get a hold of this?"
 	color = "#a502e0" // rgb: 96, 0, 255
-	metabolization_rate = 0.5 * REAGENTS_METABOLISM
+	metabolization_rate = 0.2 * REAGENTS_METABOLISM
 	var/startHunger
 	can_synth = TRUE

@@ -206,15 +206,13 @@
 	can_synth = FALSE

 /datum/reagent/fermi/nanite_b_gone/on_mob_life(mob/living/carbon/C)
-	//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
 	GET_COMPONENT_FROM(N, /datum/component/nanites, C)
 	if(isnull(N))
 		return ..()
-	N.nanite_volume = -cached_purity//0.5 seems to be the default to me, so it'll neuter them.
+	N.nanite_volume = -cached_purity*2//0.5 seems to be the default to me, so it'll neuter them.
 	..()

 /datum/reagent/fermi/nanite_b_gone/overdose_process(mob/living/carbon/C)
-	//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
 	GET_COMPONENT_FROM(N, /datum/component/nanites, C)
 	if(prob(5))
 		to_chat(C, "<span class='warning'>The residual voltage from the nanites causes you to seize up!</b></span>")
@@ -226,7 +224,7 @@
 		to_chat(C, "<span class='warning'>The nanites short circuit within your system!</b></span>")
 	if(isnull(N))
 		return ..()
-	N.nanite_volume = -2
+	N.nanite_volume = -4*cached_purity
 	..()

 /datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)