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

Changed to weakness

Browse Source
This commit is contained in:
Fermi
2019-06-14 11:56:28 +01:00
parent d6edc8db1f
commit e95b371ea5
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+6 -6
View File
@@ -1,6 +1,6 @@
#define FLAG_STATUS_NONE (1 << 0)
#define FLAG_STATUS_PH_IMMUNE (1 << 1)
#define FLAG_STATUS_TEMP_IMMUNE (1 << 2)
#define FLAG_STATUS_PH (1 << 1)
#define FLAG_STATUS_TEMP (1 << 2)
/obj/item/reagent_containers
name = "Container"
@@ -15,7 +15,7 @@
var/spawned_disease = null
var/disease_amount = 20
var/spillable = FALSE
var/beaker_resistances |= FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE
var/beaker_weaknesses = NONE
/obj/item/reagent_containers/Initialize(mapload, vol)
. = ..()
@@ -130,7 +130,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_weaknesses == FLAG_STATUS_TEMP)
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)
for(var/mob/H in seen)
@@ -142,7 +142,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_weaknesses == FLAG_STATUS_TEMP)
if(reagents.chem_temp > 444)//assuming polypropylene
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)
@@ -153,7 +153,7 @@
//melts glass beakers
/obj/item/reagent_containers/proc/pH_check()
if(!beaker_resistances == FLAG_STATUS_PH_IMMUNE)
if(beaker_weaknesses == FLAG_STATUS_PH)
if((reagents.pH < 0.5) || (reagents.pH > 13.5))
var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen)