cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 05:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-11-19 23:28:09 +10:30
parent cfb5710166 43dca48e99
commit 2b4cd94650
120 changed files with 1164 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -194,8 +194,8 @@
del(src)
return
/obj/item/weapon/reagent_containers/food/snacks/proc/is_sliceable()
return (slices_num <= 0 || !slices_num || !slice_path)
/obj/item/weapon/reagent_containers/food/snacks/proc/is_sliceable()
return (slices_num && slice_path && slices_num > 0)
/obj/item/weapon/reagent_containers/food/snacks/Del()
if(contents)

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

@@ -153,12 +153,16 @@
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"
desc = "A beaker. Can hold up to 50 units."
desc = "A beaker."
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
matter = list("glass" = 500)
New()
..()
desc += " Can hold up to [volume] units."
on_reagent_change()
update_icon()
@@ -199,7 +203,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/large
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units."
desc = "A large beaker."
icon_state = "beakerlarge"
matter = list("glass" = 5000)
volume = 120
@@ -209,7 +213,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 60 units."
desc = "A cryostasis beaker that allows for chemical storage without reactions."
icon_state = "beakernoreact"
matter = list("glass" = 500)
volume = 60
@@ -218,7 +222,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/bluespace
name = "bluespace beaker"
desc = "A bluespace beaker, powered by experimental bluespace technology. Can hold up to 300 units."
desc = "A bluespace beaker, powered by experimental bluespace technology."
icon_state = "beakerbluespace"
matter = list("glass" = 5000)
volume = 300
@@ -229,7 +233,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/vial
name = "vial"
desc = "A small glass vial. Can hold up to 25 units."
desc = "A small glass vial."
icon_state = "vial"
matter = list("glass" = 250)
volume = 30