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

ghommie said

Browse Source
This commit is contained in:
TrilbySpaceClone
2020-01-07 03:10:22 -05:00
parent f7aa4f3050
commit 6a2696f1f8
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports/parts.dm
+5 -1
View File
@@ -107,6 +107,7 @@
cost = 300
unit_name = "small glass dish"
export_types = list(/obj/item/reagent_containers/glass/beaker/glass_dish)
include_subtypes = FALSE
/datum/export/glasswork_lens
cost = 1800
@@ -117,13 +118,16 @@
cost = 1200
unit_name = "flask with spout"
export_types = list(/obj/item/reagent_containers/glass/beaker/flaskspouty)
include_subtypes = FALSE
/datum/export/glasswork_smallflask
cost = 600
unit_name = "small flask"
export_types = list(/obj/item/reagent_containers/glass/beaker/flask_small)
include_subtypes = FALSE
/datum/export/glasswork_largeflask
cost = 1000
unit_name = "large flask"
export_types = list(/obj/item/reagent_containers/glass/beaker/flask_large)
export_types = list(/obj/item/reagent_containers/glass/beaker/flask_small/flask_large)
include_subtypes = FALSE
code/modules/crafting/glassware.dm
+1 -1
View File
@@ -289,7 +289,7 @@
name = "Metled glass"
desc = "A blob of metled glass on the end of a blowing rod. Needs to be cut off with some tools."
icon_state = "blowing_rods_inuse"
next_step = /obj/item/reagent_containers/glass/beaker/flask_large
next_step = /obj/item/reagent_containers/glass/beaker/flask_small/flask_large
/obj/item/glasswork/glass_base/flask_large_part2/attackby(obj/item/I, mob/user, params)
..()
code/modules/reagents/reagent_containers/glass.dm
+3 -7
View File
@@ -156,7 +156,7 @@
/obj/item/reagent_containers/glass/beaker/jar
name = "honey jar"
desc = "A jar for honey. It can hold up to 50 units of sweet delight. Unable to withstand reagents of an extreme pH."
desc = "A jar for honey. It can hold up to 60 units of sweet delight. Unable to withstand reagents of an extreme pH."
icon_state = "honey"
/obj/item/reagent_containers/glass/beaker/glass_dish
@@ -168,18 +168,16 @@
volume = 3
/obj/item/reagent_containers/glass/beaker/glass_dish/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
/obj/item/reagent_containers/glass/beaker/flask_large
/obj/item/reagent_containers/glass/beaker/flask_small/flask_large
name = "large flask"
desc = "A large flask. It can hold up to 80 units. Unable to withstand reagents of an extreme pH."
materials = list(MAT_GLASS=2500)
icon_state = "flasklarge"
volume = 80
/obj/item/reagent_containers/glass/beaker/flask_large/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
/obj/item/reagent_containers/glass/beaker/flask_small/flask_large/Initialize()
. = ..()
/obj/item/reagent_containers/glass/beaker/flask_small
@@ -190,7 +188,6 @@
volume = 40
/obj/item/reagent_containers/glass/beaker/flask_small/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
/obj/item/reagent_containers/glass/beaker/flaskspouty
@@ -202,7 +199,6 @@
volume = 120
/obj/item/reagent_containers/glass/beaker/flaskspouty/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
/obj/item/reagent_containers/glass/beaker/large