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

Adventures in bitflags!

Browse Source
This commit is contained in:
Fermi
2019-06-14 12:47:22 +01:00
parent e95b371ea5
commit 2365f7337c
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/glass.dm
+15 -10
View File
@@ -113,7 +113,7 @@
icon_state = "beaker"
item_state = "beaker"
materials = list(MAT_GLASS=500)
beaker_weaknesses |= FLAG_STATUS_PH
beaker_weakness_bitflag = PH_WEAK
/obj/item/reagent_containers/glass/beaker/Initialize()
. = ..()
@@ -174,8 +174,10 @@
volume = 150
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
beaker_weaknesses &= ~FLAG_STATUS_PH
beaker_weaknesses |= FLAG_STATUS_TEMP
/obj/item/reagent_containers/glass/beaker/plastic/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
beaker_weakness_bitflag |= TEMP_WEAK
/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
@@ -190,7 +192,9 @@
volume = 200
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
beaker_weaknesses &= ~FLAG_STATUS_PH
/obj/item/reagent_containers/glass/beaker/meta/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
@@ -200,9 +204,9 @@
materials = list(MAT_METAL=3000)
volume = 50
amount_per_transfer_from_this = 10
beaker_weaknesses &= ~FLAG_STATUS_PH
/obj/item/reagent_containers/glass/beaker/noreact/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
reagents.set_reacting(FALSE)
@@ -272,7 +276,9 @@
SLOT_L_STORE, SLOT_R_STORE,\
SLOT_GENERC_DEXTROUS_STORAGE
)
beaker_weaknesses &= ~FLAG_STATUS_PH_IMMUNE
/obj/item/reagent_containers/glass/bucket/Initialize()
beaker_weakness_bitflag |= TEMP_WEAK
/obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/mop))
@@ -322,8 +328,9 @@
materials = list(MAT_GLASS=0)
volume = 50
amount_per_transfer_from_this = 10
beaker_weaknesses |= FLAG_STATUS_PH
beaker_weaknesses |= FLAG_STATUS_TEMP
/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
beaker_weakness_bitflag |= TEMP_WEAK
/obj/item/reagent_containers/glass/beaker/waterbottle/empty
list_reagents = list()
@@ -335,8 +342,6 @@
list_reagents = list("water" = 100)
volume = 100
amount_per_transfer_from_this = 20
beaker_weaknesses |= FLAG_STATUS_PH
beaker_weaknesses |= FLAG_STATUS_TEMP
/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
list_reagents = list()