More fixes.

This commit is contained in:
Fermi
2019-06-14 15:43:48 +01:00
parent d7cffadc13
commit b4beb006f9
10 changed files with 36 additions and 19 deletions
+15 -5
View File
@@ -524,7 +524,10 @@
fermiIsReacting = FALSE
reactedVol = 0
targetVol = 0
holder.pH_check()
//pH check, handled at the end to reduce calls.
if(istype(my_atom, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()
C.FermiFinish(src, my_atom, multiplier)
handle_reactions()
update_total()
@@ -550,7 +553,10 @@
fermiIsReacting = FALSE
reactedVol = 0
targetVol = 0
holder.pH_check()
//pH check, handled at the end to reduce calls.
if(istype(my_atom, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()
C.FermiFinish(src, my_atom, multiplier)
handle_reactions()
update_total()
@@ -566,7 +572,10 @@
fermiIsReacting = FALSE
reactedVol = 0
targetVol = 0
holder.pH_check()
//pH check, handled at the end to reduce calls.
if(istype(my_atom, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()
C.FermiFinish(src, my_atom, multiplier)
handle_reactions()
update_total()
@@ -860,8 +869,9 @@
if(my_atom)
my_atom.on_reagent_change(ADD_REAGENT)
R.on_merge(data, amount, my_atom, other_purity)
if(R.OnMobMergeCheck == TRUE)//Forces on_mob_add proc when a chem is merged
R.on_mob_add(my_atom, amount)
if(isliving(my_atom))
if(R.OnMobMergeCheck == TRUE)//Forces on_mob_add proc when a chem is merged
R.on_mob_add(my_atom, amount)
if(!no_react)
handle_reactions()
+1
View File
@@ -58,6 +58,7 @@
//Just in case
/obj/item/organ/liver/Remove(mob/living/carbon/M, special = 0)
..()
M.remove_movespeed_modifier(LIVER_SWELLING_MOVE_MODIFY)
M.ResetBloodVol() //At the moment, this shouldn't allow application twice. You either have this OR a thirsty ferret.
sizeMoveMod(1, M)
@@ -22,6 +22,7 @@
if(replaced)
replaced.Remove(M, special = 1)
if(drop_if_replaced)
message_admins("[get_turf(M)]")
replaced.forceMove(get_turf(M))
else
qdel(replaced)
+1 -1
View File
@@ -1239,7 +1239,7 @@
else
return
if(message_admins)
if(message_admins)//Do you want this in?
message_admins("[ADMIN_LOOKUPFLW(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
log_game("FERMICHEM: [key_name(user)] has said '[log_message]' with a Velvet Voice, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
//SSblackbox.record_feedback("tally", "Velvet_voice", 1, log_message) If this is on, it fills the thing up and OOFs the server