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

Indents and eigenstate var reduction.

Browse Source
This commit is contained in:
Fermi
2019-06-14 11:24:21 +01:00
parent ee458b102f
commit ab35b018db
8 changed files with 83 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers.dm
+5 -5
View File
@@ -1,7 +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_NONE (1 << 0)
#define FLAG_STATUS_PH_IMMUNE (1 << 1)
#define FLAG_STATUS_TEMP_IMMUNE (1 << 2)
/obj/item/reagent_containers
name = "Container"
@@ -16,9 +15,10 @@
var/spawned_disease = null
var/disease_amount = 20
var/spillable = FALSE
var/beaker_resistances |= (FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE)
var/beaker_resistances = NONE
/obj/item/reagent_containers/Initialize(mapload, vol)
beaker_resistances |= FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE
. = ..()
if(isnum(vol) && vol > 0)
volume = vol
code/modules/reagents/reagent_containers/glass.dm
+3 -3
View File
@@ -113,7 +113,7 @@
icon_state = "beaker"
item_state = "beaker"
materials = list(MAT_GLASS=500)
beaker_resistances &= ~FLAG_STATUS_PH_IMMUNE
beaker_resistances = FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/Initialize()
. = ..()
@@ -191,7 +191,7 @@
volume = 200
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
beaker_resistances |= (1<<3)
beaker_resistances |= FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -201,7 +201,7 @@
materials = list(MAT_METAL=3000)
volume = 50
amount_per_transfer_from_this = 10
beaker_resistances |= (1<<3)
beaker_resistances |= FLAG_STATUS_PH_IMMUNE | FLAG_STATUS_TEMP_IMMUNE
/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
. = ..()