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

last touches

Browse Source
This commit is contained in:
TrilbySpaceClone
2019-12-29 04:54:31 -05:00
parent e71d23fc39
commit 5fbe7fcc2b
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/crafting/glassware.dm
View File

@@ -32,6 +32,8 @@
/obj/item/lens
name = "Optical Lens"
desc = "Good for selling or crafting, by itself its useless"
icon = 'icons/obj/chemical.dmi'
icon_state = "glass_optics"
//////////////////////Chem Disk/////////////////////
//Two Steps //
@@ -124,7 +126,7 @@
/obj/item/glasswork/glass_base/glass_lens_part4/attackby(obj/item/I, mob/user, params)
..()
if(tool_behaviour == TOOL_GLASS_CUT)
if(I.tool_behaviour == TOOL_GLASS_CUT)
new next_step(user.loc, 1)
new rod(user.loc, 1)
qdel(src)
@@ -132,6 +134,7 @@
/obj/item/glasswork/glass_base/glass_lens_part5
name = "Unpolished glass lens"
desc = "A small unpolished glass lens. Could be polished with some cloth."
icon = 'icons/obj/chemical.dmi'
icon_state = "glass_optics"
next_step = /obj/item/glasswork/glass_base/glass_lens_part6
@@ -144,6 +147,7 @@
/obj/item/glasswork/glass_base/glass_lens_part6
name = "Unrefined glass lens"
desc = "A small polished glass lens. Just needs to be refined with some sandstone."
icon = 'icons/obj/chemical.dmi'
icon_state = "glass_optics"
next_step = /obj/item/lens

17
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -105,7 +105,6 @@
return
..()
/obj/item/reagent_containers/glass/beaker
name = "beaker"
desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
@@ -166,6 +165,10 @@
possible_transfer_amounts = list(0.1,0.5,0.75,1,2,3)
volume = 3
/obj/item/reagent_containers/glass/beaker/glass_dish/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
/obj/item/reagent_containers/glass/beaker/flask_large
name = "large flask"
desc = "A large flask. It can hold up to 80 units. Unable to withstand reagents of an extreme pH."
@@ -173,6 +176,10 @@
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
name = "small flask"
desc = "A small flask. It can hold up to 40 units. Unable to withstand reagents of an extreme pH."
@@ -180,6 +187,10 @@
icon_state = "flasksmall"
volume = 40
/obj/item/reagent_containers/glass/beaker/flask_small/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
/obj/item/reagent_containers/glass/beaker/flaskspouty
name = "flask with spout"
desc = "A flask with a spout! It can hold up to 120 units. Unable to withstand reagents of an extreme pH."
@@ -188,6 +199,10 @@
possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30,50,100,120)
volume = 120
/obj/item/reagent_containers/glass/beaker/flaskspouty/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
/obj/item/reagent_containers/glass/beaker/large
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."