Merge pull request #2333 from Baystation12/BEF-staging

Merge on the 16th if no issues
This commit is contained in:
Chinsky
2013-02-17 04:44:25 -08:00
106 changed files with 1791 additions and 4687 deletions

View File

@@ -341,6 +341,10 @@
P.pixel_x = rand(-7, 7) //random position
P.pixel_y = rand(-7, 7)
reagents.trans_to(P,30)
var/bottle_num = min(max(input("Enter bottle design number","Bottle number"), 0), 20) as num
P.icon_state = "bottle[bottle_num]"
desc = "A small bottle, design number #[bottle_num]."
else
var/obj/item/weapon/reagent_containers/food/condiment/P = new/obj/item/weapon/reagent_containers/food/condiment(src.loc)
reagents.trans_to(P,50)

View File

@@ -196,6 +196,10 @@
if(sattisfaction_text)
M.emote("[sattisfaction_text]")
del(src)
if(ismouse(M))
var/mob/living/simple_animal/mouse/N = M
N.emote("nibbles away at the [src]")
N.health = min(N.health + 1, N.maxHealth)
////////////////////////////////////////////////////////////////////////////////