Hotfix for egregious oversights.

This commit is contained in:
Fermi
2019-06-25 07:22:20 +01:00
parent 8605d3a246
commit 4145b0f256
7 changed files with 39 additions and 18 deletions
@@ -145,6 +145,8 @@ Creating a chem with a low purity will make you permanently fall in love with so
var/mob/living/creator
pH = 10
OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
can_synth = FALSE
/datum/reagent/fermi/enthrall/test
name = "MKUltraTest"
@@ -309,7 +311,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
if(!M.has_status_effect(STATUS_EFFECT_INLOVE))
var/list/seen = viewers(7, get_turf(M))//Sound and sight checkers
for(var/victim in seen)
if((victim == /mob/living/simple_animal/pet/) || (victim == M) || (M.stat == DEAD))
if((victim == /mob/living/simple_animal/pet/) || (victim == M) || (M.stat == DEAD) || (isliving(victim)))
seen = seen - victim
if(seen.len == 0)
return
@@ -195,6 +195,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
name = "synthetic-derived growth factor"
id = "SDGFheal"
metabolization_rate = 1
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)
if(M.blood_volume < (BLOOD_VOLUME_NORMAL*M.blood_ratio))
@@ -19,7 +19,7 @@
//OD is low for a reason. I'd like fermichems to have low ODs, and dangerous ODs, and since this is a meme chem that everyone will rush to make, it'll be a lesson learnt early.
/datum/reagent/fermi/breast_enlarger
name = "Sucubus milk"
name = "Succubus milk"
id = "breast_enlarger"
description = "A volatile collodial mixture derived from milk that encourages mammary production via a potent estrogen mix."
color = "#E60584" // rgb: 96, 0, 255
@@ -133,7 +133,7 @@
..()
/datum/reagent/fermi/BEsmaller
name = "Sucubus milk"
name = "Succubus milk"
id = "BEsmaller"
description = "A volatile collodial mixture derived from milk that encourages mammary production via a potent estrogen mix."
color = "#E60584" // rgb: 96, 0, 255
@@ -99,6 +99,8 @@
hatArmor = (purity/10)
else
hatArmor = - (purity/10)
if(hatArmor > 90)
return ..()
var/obj/item/W = M.head
W.armor = W.armor.modifyAllRatings(hatArmor)
..()
@@ -139,7 +141,7 @@
if(prob(20))
var/list/seen = viewers(5, get_turf(M))//Sound and sight checkers
for(var/victim in seen)
if((victim == /mob/living/simple_animal/pet/) || (victim == M))
if((istype(victim, /mob/living/simple_animal/pet/)) || (victim == M) || (!isliving(victim)))
seen = seen - victim
if(seen)
to_chat(M, "You notice [pick(seen)]'s bulge [pick("OwO!", "uwu!")]")
@@ -160,7 +162,7 @@
if(prob(20))
var/list/seen = viewers(5, get_turf(M))//Sound and sight checkers
for(var/victim in seen)
if((victim = /mob/living/simple_animal/pet/) || (victim == M))
if((istype(victim, /mob/living/simple_animal/pet/)) || (victim == M) || (!isliving(victim)))
seen = seen - victim
if(seen)
to_chat(M, "You notice [pick(seen)]'s bulge [pick("OwO!", "uwu!")]")
@@ -246,10 +248,15 @@
taste_description = "acid burns, ow"
color = "#FFFFFF"
pH = 0
can_synth = FALSE
/datum/reagent/fermi/fermiAcid/reaction_mob(mob/living/carbon/C, method)
var/target = C.get_bodypart(BODY_ZONE_CHEST)
var/acidstr = ((5-C.reagents.pH)*2)
var/acidstr
if(!C.reagents.pH || C.reagents.pH >5)
acidstr = 3
else
acidstr = ((5-C.reagents.pH)*2) //runtime - null.pH ?
C.adjustFireLoss(acidstr/2, 0)
if((method==VAPOR) && (!C.wear_mask))
if(prob(20))
@@ -283,6 +290,7 @@
id = "fermiTest"
description = "You should be really careful with this...! Also, how did you get this?"
addProc = TRUE
can_synth = FALSE
/datum/reagent/fermi/fermiTest/on_new(datum/reagents/holder)
..()
@@ -318,6 +326,7 @@
description = "You should be really careful with this...! Also, how did you get this? You shouldn't have this!"
data = "merge"
color = "FFFFFF"
can_synth = FALSE
//I'm concerned this is too weak, but I also don't want deathmixes.
/datum/reagent/fermi/fermiTox/on_mob_life(mob/living/carbon/C, method)
@@ -18,7 +18,7 @@
pH = 7
var/ImpureTot = 0
var/turf/T = get_turf(my_atom)
if(temp>500)//if hot, start a fire
switch(temp)
if (500 to 750)
@@ -89,6 +89,8 @@
PurityMin = 0.4 //The minimum purity something has to be above, otherwise it explodes.
/datum/chemical_reaction/fermi/eigenstate/FermiFinish(datum/reagents/holder, var/atom/my_atom)//Strange how this doesn't work but the other does.
if(!locate(/datum/reagent/fermi/eigenstate) in my_atom.reagents.reagent_list)
return
var/turf/open/location = get_turf(my_atom)
var/datum/reagent/fermi/eigenstate/E = locate(/datum/reagent/fermi/eigenstate) in my_atom.reagents.reagent_list
if(location)
@@ -397,6 +399,8 @@
/datum/chemical_reaction/fermi/fermiABuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
if(!locate(/datum/reagent/fermi/fermiABuffer) in my_atom.reagents.reagent_list)
return
var/datum/reagent/fermi/fermiABuffer/Fa = locate(/datum/reagent/fermi/fermiABuffer) in my_atom.reagents.reagent_list
Fa.data = 3
@@ -423,6 +427,8 @@
/datum/chemical_reaction/fermi/fermiBBuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
if(!locate(/datum/reagent/fermi/fermiBBuffer) in my_atom.reagents.reagent_list)
return
var/datum/reagent/fermi/fermiBBuffer/Fb = locate(/datum/reagent/fermi/fermiBBuffer) in my_atom.reagents.reagent_list
Fb.data = 11