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

pH and temp immune bitflagging.

Browse Source
This commit is contained in:
Fermi
2019-06-13 06:45:29 +01:00
parent aa7805eaa4
commit c9a66544bc
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+4 -4
View File
@@ -16,7 +16,7 @@
var/spawned_disease = null
var/disease_amount = 20
var/spillable = FALSE
var/beaker_resistances |= 1<<3
var/beaker_resistances |= (1<<3)
/obj/item/reagent_containers/Initialize(mapload, vol)
. = ..()
@@ -131,7 +131,7 @@
//melts plastic beakers
/obj/item/reagent_containers/microwave_act(obj/machinery/microwave/M)
reagents.expose_temperature(1000)
if(!beaker_resistances = FLAG_STATUS_TEMP_IMMUNE)
if(!beaker_resistances == FLAG_STATUS_TEMP_IMMUNE)
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)
for(var/mob/H in seen)
@@ -143,7 +143,7 @@
//melts plastic beakers
/obj/item/reagent_containers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
reagents.expose_temperature(exposed_temperature)
if(!beaker_resistances = FLAG_STATUS_TEMP_IMMUNE)
if(!beaker_resistances == FLAG_STATUS_TEMP_IMMUNE)
if(reagents.chem_temp > 444)//assuming polypropylene
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)
@@ -154,7 +154,7 @@
//melts glass beakers
/obj/item/reagent_containers/proc/pH_check()
if(!beaker_resistances = FLAG_STATUS_PH_IMMUNE)
if(!beaker_resistances == FLAG_STATUS_PH_IMMUNE)
if((reagents.pH < 0.5) || (reagents.pH > 13.5))
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)
code/modules/reagents/reagent_containers/bottle.dm
-2
View File
@@ -7,8 +7,6 @@
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_immune = TRUE
/obj/item/reagent_containers/glass/bottle/Initialize()
code/modules/reagents/reagent_containers/glass.dm
+12 -14
View File
@@ -113,7 +113,7 @@
icon_state = "beaker"
item_state = "beaker"
materials = list(MAT_GLASS=500)
pH_immune = FALSE
beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
/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_immune = FALSE
beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
/obj/item/reagent_containers/glass/beaker/plastic
name = "x-large beaker"
@@ -175,8 +175,8 @@
volume = 150
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
temp_immune = FALSE
pH_immune = TRUE
beaker_resistances &= ~FLAG_STATUS_TEMP_IMMUNE
beaker_resistances |= FLAG_STATUS_PH_IMMUNE
/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
@@ -191,8 +191,7 @@
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_immune = TRUE
beaker_resistances |= (1<<3)
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -202,8 +201,7 @@
materials = list(MAT_METAL=3000)
volume = 50
amount_per_transfer_from_this = 10
temp_immune = TRUE
pH_immune = TRUE
beaker_resistances |= (1<<3)
/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
. = ..()
@@ -219,7 +217,7 @@
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
pH_immune = FALSE
beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
/obj/item/reagent_containers/glass/beaker/cryoxadone
list_reagents = list("cryoxadone" = 30)
@@ -276,7 +274,7 @@
SLOT_L_STORE, SLOT_R_STORE,\
SLOT_GENERC_DEXTROUS_STORAGE
)
pH_immune = FALSE
beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/mop))
@@ -326,8 +324,8 @@
materials = list(MAT_GLASS=0)
volume = 50
amount_per_transfer_from_this = 10
pH_immune = FALSE
temp_immune = FALSE
beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
beaker_resistances &= ~FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/waterbottle/empty
list_reagents = list()
@@ -339,8 +337,8 @@
list_reagents = list("water" = 100)
volume = 100
amount_per_transfer_from_this = 20
pH_immune = FALSE
temp_immune = FALSE
beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
beaker_resistances &= ~FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
list_reagents = list()