last touches
This commit is contained in:
@@ -32,6 +32,8 @@
|
|||||||
/obj/item/lens
|
/obj/item/lens
|
||||||
name = "Optical Lens"
|
name = "Optical Lens"
|
||||||
desc = "Good for selling or crafting, by itself its useless"
|
desc = "Good for selling or crafting, by itself its useless"
|
||||||
|
icon = 'icons/obj/chemical.dmi'
|
||||||
|
icon_state = "glass_optics"
|
||||||
|
|
||||||
//////////////////////Chem Disk/////////////////////
|
//////////////////////Chem Disk/////////////////////
|
||||||
//Two Steps //
|
//Two Steps //
|
||||||
@@ -124,7 +126,7 @@
|
|||||||
|
|
||||||
/obj/item/glasswork/glass_base/glass_lens_part4/attackby(obj/item/I, mob/user, params)
|
/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 next_step(user.loc, 1)
|
||||||
new rod(user.loc, 1)
|
new rod(user.loc, 1)
|
||||||
qdel(src)
|
qdel(src)
|
||||||
@@ -132,6 +134,7 @@
|
|||||||
/obj/item/glasswork/glass_base/glass_lens_part5
|
/obj/item/glasswork/glass_base/glass_lens_part5
|
||||||
name = "Unpolished glass lens"
|
name = "Unpolished glass lens"
|
||||||
desc = "A small unpolished glass lens. Could be polished with some cloth."
|
desc = "A small unpolished glass lens. Could be polished with some cloth."
|
||||||
|
icon = 'icons/obj/chemical.dmi'
|
||||||
icon_state = "glass_optics"
|
icon_state = "glass_optics"
|
||||||
next_step = /obj/item/glasswork/glass_base/glass_lens_part6
|
next_step = /obj/item/glasswork/glass_base/glass_lens_part6
|
||||||
|
|
||||||
@@ -144,6 +147,7 @@
|
|||||||
/obj/item/glasswork/glass_base/glass_lens_part6
|
/obj/item/glasswork/glass_base/glass_lens_part6
|
||||||
name = "Unrefined glass lens"
|
name = "Unrefined glass lens"
|
||||||
desc = "A small polished glass lens. Just needs to be refined with some sandstone."
|
desc = "A small polished glass lens. Just needs to be refined with some sandstone."
|
||||||
|
icon = 'icons/obj/chemical.dmi'
|
||||||
icon_state = "glass_optics"
|
icon_state = "glass_optics"
|
||||||
next_step = /obj/item/lens
|
next_step = /obj/item/lens
|
||||||
|
|
||||||
|
|||||||
@@ -105,7 +105,6 @@
|
|||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|
||||||
/obj/item/reagent_containers/glass/beaker
|
/obj/item/reagent_containers/glass/beaker
|
||||||
name = "beaker"
|
name = "beaker"
|
||||||
desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
|
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)
|
possible_transfer_amounts = list(0.1,0.5,0.75,1,2,3)
|
||||||
volume = 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
|
/obj/item/reagent_containers/glass/beaker/flask_large
|
||||||
name = "large flask"
|
name = "large flask"
|
||||||
desc = "A large flask. It can hold up to 80 units. Unable to withstand reagents of an extreme pH."
|
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"
|
icon_state = "flasklarge"
|
||||||
volume = 80
|
volume = 80
|
||||||
|
|
||||||
|
/obj/item/reagent_containers/glass/beaker/flask_large/Initialize()
|
||||||
|
beaker_weakness_bitflag &= ~PH_WEAK
|
||||||
|
. = ..()
|
||||||
|
|
||||||
/obj/item/reagent_containers/glass/beaker/flask_small
|
/obj/item/reagent_containers/glass/beaker/flask_small
|
||||||
name = "small flask"
|
name = "small flask"
|
||||||
desc = "A small flask. It can hold up to 40 units. Unable to withstand reagents of an extreme pH."
|
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"
|
icon_state = "flasksmall"
|
||||||
volume = 40
|
volume = 40
|
||||||
|
|
||||||
|
/obj/item/reagent_containers/glass/beaker/flask_small/Initialize()
|
||||||
|
beaker_weakness_bitflag &= ~PH_WEAK
|
||||||
|
. = ..()
|
||||||
|
|
||||||
/obj/item/reagent_containers/glass/beaker/flaskspouty
|
/obj/item/reagent_containers/glass/beaker/flaskspouty
|
||||||
name = "flask with spout"
|
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."
|
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)
|
possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30,50,100,120)
|
||||||
volume = 120
|
volume = 120
|
||||||
|
|
||||||
|
/obj/item/reagent_containers/glass/beaker/flaskspouty/Initialize()
|
||||||
|
beaker_weakness_bitflag &= ~PH_WEAK
|
||||||
|
. = ..()
|
||||||
|
|
||||||
/obj/item/reagent_containers/glass/beaker/large
|
/obj/item/reagent_containers/glass/beaker/large
|
||||||
name = "large beaker"
|
name = "large beaker"
|
||||||
desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
|
desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
|
||||||
|
|||||||
Reference in New Issue
Block a user