shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Spelling is hard.

Browse Source
This commit is contained in:
Fermi
2019-06-13 03:24:02 +01:00
parent 93973b630c
commit 91e58d896e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+2 -2
View File
@@ -11,7 +11,7 @@
var/spawned_disease = null
var/disease_amount = 20
var/spillable = FALSE
var/pH_immunne = TRUE//true for now, just so things that shouldn't melt don't.
var/pH_immune = TRUE//true for now, just so things that shouldn't melt don't.
var/temp_immune = TRUE
/obj/item/reagent_containers/Initialize(mapload, vol)
@@ -152,7 +152,7 @@
//melts glass beakers
/obj/item/reagent_containers/proc/pH_check()
if(pH_immunne == TRUE)
if(pH_immune == TRUE)
return
else if((reagents.pH < 0.5) || (reagents.pH > 13.5))
var/list/seen = viewers(5, get_turf(src))
code/modules/reagents/reagent_containers/bottle.dm
+1 -1
View File
@@ -8,7 +8,7 @@
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
pH_immune = TRUE
/obj/item/reagent_containers/glass/bottle/Initialize()
code/modules/reagents/reagent_containers/glass.dm
+9 -9
View File
@@ -113,7 +113,7 @@
icon_state = "beaker"
item_state = "beaker"
materials = list(MAT_GLASS=500)
pH_immunne = FALSE
pH_immune = FALSE
/obj/item/reagent_containers/glass/beaker/Initialize()
. = ..()
@@ -165,7 +165,7 @@
volume = 100
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
pH_immunne = FALSE
pH_immune = FALSE
/obj/item/reagent_containers/glass/beaker/plastic
name = "x-large beaker"
@@ -176,7 +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
pH_immune = TRUE
/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
@@ -192,7 +192,7 @@
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
pH_immune = TRUE
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -203,7 +203,7 @@
volume = 50
amount_per_transfer_from_this = 10
temp_immune = TRUE
pH_immunne = TRUE
pH_immune = TRUE
/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
. = ..()
@@ -219,7 +219,7 @@
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
pH_immunne = FALSE
pH_immune = FALSE
/obj/item/reagent_containers/glass/beaker/cryoxadone
list_reagents = list("cryoxadone" = 30)
@@ -276,7 +276,7 @@
SLOT_L_STORE, SLOT_R_STORE,\
SLOT_GENERC_DEXTROUS_STORAGE
)
pH_immunne = FALSE
pH_immune = FALSE
/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/mop))
@@ -326,7 +326,7 @@
materials = list(MAT_GLASS=0)
volume = 50
amount_per_transfer_from_this = 10
pH_immunne = FALSE
pH_immune = FALSE
temp_immune = FALSE
/obj/item/reagent_containers/glass/beaker/waterbottle/empty
@@ -339,7 +339,7 @@
list_reagents = list("water" = 100)
volume = 100
amount_per_transfer_from_this = 20
pH_immunne = FALSE
pH_immune = FALSE
temp_immune = FALSE
/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty