Fixes CE's office door name, renames a few APCs to match their area, changed research, mining, and atmospherics doors. Fixes watering cans. Changelog!

This commit is contained in:
Ren Erthilo
2012-05-03 22:05:59 +01:00
parent 0554a4627c
commit 933a95dd6e
5 changed files with 58 additions and 34 deletions

View File

@@ -262,19 +262,17 @@ var/global/list/autolathe_recipes_hidden = list( \
restart:
if(outputAmount > 0)
if(src.m_amount >= template.m_amt*multiplier && src.g_amount >= template.g_amt*multiplier)
busy = 1
use_power(power)
icon_state = "autolathe"
flick("autolathe_n",src)
spawn(16)
if(!busy)
busy = 1
use_power(power)
spawn(16)
use_power(power)
spawn(16)
flick("autolathe_n",src)
src.m_amount -= template.m_amt*multiplier
src.g_amount -= template.g_amt*multiplier
if(src.m_amount < 0)

View File

@@ -76,7 +76,7 @@
user << "\red Someone's already washing something here."
return
if (istype(O, (/obj/item/weapon/reagent_containers/glass/bucket || /obj/item/weapon/reagent_containers/glass/watercan)))
if (istype(O, /obj/item/weapon/reagent_containers/glass/bucket))
O:reagents.add_reagent("water", 70)
user.visible_message( \
"\blue [user] fills the [O] using the [src].", \

View File

@@ -1887,19 +1887,16 @@
del(D)
del(src)
/obj/item/weapon/reagent_containers/glass/watercan
/obj/item/weapon/reagent_containers/glass/bucket/wateringcan
name = "watering can"
desc = "A watering can, for all your watering needs."
icon = 'hydroponics.dmi'
icon_state = "watercan"
item_state = "bucket"
m_amt = 200
g_amt = 0
w_class = 3.0
amount_per_transfer_from_this = 20
possible_transfer_amounts = list(10,20,30,50,70)
volume = 70
flags = FPRINT | OPENCONTAINER
attackby(var/obj/D, mob/user as mob)
if(isprox(D))
return
/obj/item/weapon/reagent_containers/glass/cantister
desc = "It's a canister. Mainly used for transporting fuel."