Few tweaks and fixes to last commits.

This commit is contained in:
Thalpy
2019-05-29 20:04:52 +01:00
parent 6117e3a6aa
commit 71eb285472
7 changed files with 27 additions and 15 deletions

View File

@@ -358,7 +358,7 @@
required_reagents[pick(additions)] = rand(1, 5)//weird
/datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom)//Strange how this doesn't work but the other does.
message_admins("Someone found the hidden reaction. Amazing!! Please tell Fermis!!")
SSblackbox.record_feedback("catgirlium", "catgirlium made!")//log
//ReagentVars
//Turns you into a cute catto while it's in your system.
@@ -400,7 +400,8 @@
catto.name = H.name
catto.desc = "A cute catto! They remind you of [H] somehow."
catto.color = "#[H.dna.features["mcolor"]]"
H.forceMove(locate(10,6,1))//To the zelda room.
//H.forceMove(locate(10,6,1))//To the zelda room.
H.moveToNullspace()
/datum/reagent/fermi/secretcatchem/on_mob_life(mob/living/carbon/H)
if(prob(5))
@@ -410,7 +411,7 @@
/datum/reagent/fermi/secretcatchem/on_mob_delete(mob/living/carbon/H)
var/words = "Your body shifts back to normal."
do_teleport(H, catto.loc)
H.forceMove(catto)
catto.mind.transfer_to(H)
if(catshift == TRUE)
words += " ...But wait, are those ears and a tail?"

View File

@@ -840,7 +840,9 @@
//cacluate reagent based pH shift.
pH = ((cached_pH * cached_total)+(D.pH * amount))/(cached_total + amount)//should be right
holder.pH_check()//checks beaker resilience
if(istype(my_atom, /obj/item/reagent_containers/))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()//checks beaker resilience
//add the reagent to the existing if it exists
for(var/A in cached_reagents)
@@ -924,7 +926,9 @@
pH = 7
else
pH = ((pH * total_volume)-(R.pH * amount))/(total_volume - amount)
holder.pH_check()
if(istype(my_atom, /obj/item/reagent_containers/))
var/obj/item/reagent_containers/RC = my_atom
RC.pH_check()//checks beaker resilience)
amount = CLAMP(amount, 0, R.volume)
R.volume -= amount
update_total()

View File

@@ -131,10 +131,10 @@
return
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)
for(var/mob/M in seen)
to_chat(M, "<span class='notice'>[iconhtml] \The [src]'s melts from the temperature!</span>")
for(var/mob/H in seen)
to_chat(H, "<span class='notice'>[iconhtml] \The [src]'s melts from the temperature!</span>")
playsound(get_turf(src), 'sound/FermiChem/heatmelt.ogg', 80, 1)
qdel(A)
qdel(src)
..()
//melts plastic beakers
@@ -148,16 +148,16 @@
for(var/mob/M in seen)
to_chat(M, "<span class='notice'>[iconhtml] \The [src]'s melts from the temperature!</span>")
playsound(get_turf(src), 'sound/FermiChem/heatmelt.ogg', 80, 1)
qdel(A)
qdel(src)
//melts glass beakers
/obj/item/reagent_containers/proc/pH_check()
if(pH_immunne == TRUE)
return
else if((pH < 0.5) || (pH > 13.5))
else if((reagents.pH < 0.5) || (reagents.pH > 13.5))
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(A, seen)
var/iconhtml = icon2html(src, seen)
for(var/mob/M in seen)
to_chat(M, "<span class='notice'>[iconhtml] \The [my_atom]'s melts from the extreme pH!</span>")
to_chat(M, "<span class='notice'>[iconhtml] \The [src]'s melts from the extreme pH!</span>")
playsound(get_turf(src), 'sound/FermiChem/acidmelt.ogg', 80, 1)
qdel(A)
qdel(src)

View File

@@ -7,6 +7,8 @@
item_state = "atoxinbottle"
possible_transfer_amounts = list(5,10,15,25,30)
volume = 30
temp_immune = TRUE //required so that things don't melt when you dispence them in the chem_master.
pH_immunne = TRUE
/obj/item/reagent_containers/glass/bottle/Initialize()
@@ -240,7 +242,7 @@
name = "Rhinovirus culture bottle"
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
spawned_disease = /datum/disease/advance/cold
/obj/item/reagent_containers/glass/bottle/flu_virion
name = "Flu virion culture bottle"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."

View File

@@ -176,6 +176,7 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
temp_immune = FALSE
pH_immunne = TRUE
/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
@@ -190,6 +191,8 @@
volume = 200
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
temp_immune = TRUE
pH_immunne = TRUE
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -199,6 +202,8 @@
materials = list(MAT_METAL=3000)
volume = 50
amount_per_transfer_from_this = 10
temp_immune = TRUE
pH_immunne = TRUE
/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
. = ..()