Beaker resistance check moved.

This commit is contained in:
Thalpy
2019-05-29 18:29:56 +01:00
parent 1ce25acb0c
commit 45149ffc11
3 changed files with 70 additions and 57 deletions
@@ -113,6 +113,7 @@
icon_state = "beaker"
item_state = "beaker"
materials = list(MAT_GLASS=500)
pH_immunne = FALSE
/obj/item/reagent_containers/glass/beaker/Initialize()
. = ..()
@@ -164,6 +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
/obj/item/reagent_containers/glass/beaker/plastic
name = "x-large beaker"
@@ -173,6 +175,7 @@
volume = 150
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
temp_immune = FALSE
/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
@@ -211,6 +214,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
/obj/item/reagent_containers/glass/beaker/cryoxadone
list_reagents = list("cryoxadone" = 30)
@@ -267,6 +271,7 @@
SLOT_L_STORE, SLOT_R_STORE,\
SLOT_GENERC_DEXTROUS_STORAGE
)
pH_immunne = FALSE
/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/mop))
@@ -316,6 +321,8 @@
materials = list(MAT_GLASS=0)
volume = 50
amount_per_transfer_from_this = 10
pH_immunne = FALSE
temp_immune = FALSE
/obj/item/reagent_containers/glass/beaker/waterbottle/empty
list_reagents = list()
@@ -327,6 +334,8 @@
list_reagents = list("water" = 100)
volume = 100
amount_per_transfer_from_this = 20
pH_immunne = FALSE
temp_immune = FALSE
/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
list_reagents = list()