Rename honeycombs royal jellies (PleasingFungus).

The name works just as well with bee themes, but also fits with the
occasional jelly theme that vaults have. I also feel that it's a bit
more iconic.

Thankfully the bikeshed doesn't even have to change colour -- they
were always both yellow.

38 files changed, 98 insertions, 107 deletions

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index aab3dc4a9a..f72313fcf4 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -402,7 +402,7 @@ static void _acquirement_determine_food(int& type_wanted, int& quantity)
     else
     {
         type_wanted = random_choose_weighted(
-                        6, FOOD_HONEYCOMB,
+                        6, FOOD_ROYAL_JELLY,
                         1, player_mutation_level(MUT_HERBIVOROUS) ? FOOD_BREAD_RATION
                                                                   : FOOD_MEAT_RATION,
                         0);
@@ -413,7 +413,7 @@ static void _acquirement_determine_food(int& type_wanted, int& quantity)
     if (type_wanted == FOOD_BANANA || type_wanted == FOOD_ORANGE || type_wanted == FOOD_LEMON)
         quantity = 8 + random2avg(15, 2);
     // giving more of the lower food value items
-    else if (type_wanted == FOOD_HONEYCOMB || type_wanted == FOOD_CHUNK)
+    else if (type_wanted == FOOD_ROYAL_JELLY || type_wanted == FOOD_CHUNK)
         quantity += random2avg(10, 2);
     else if (type_wanted == POT_BLOOD)
     {
diff --git a/crawl-ref/source/dat/database/help.txt b/crawl-ref/source/dat/database/help.txt
index 93f16ed1ae..99b9a3e1f7 100644
--- a/crawl-ref/source/dat/database/help.txt
+++ b/crawl-ref/source/dat/database/help.txt
@@ -79,7 +79,7 @@ hotkey to travel to its location.
 
 Some examples of search strings:
 <w>cure mutation</w> find all potions of cure mutation, including potions in shops.
-<w>honey</w>         finds every single honeycomb and heaps of honeycombs.
+<w>royal</w>         finds every single royal jelly and heaps of royal jellies.
 <w>shop</w>          lists all shops. Press <w>?</w> and a shop's letter for the stock.
 <w>Lair:2</w>        find everything known to be on Lair:2.
 <w>D:[2-4]</w>       finds everything on Dungeon levels 2-4. Regexes are allowed!
diff --git a/crawl-ref/source/dat/des/branches/abyss.des b/crawl-ref/source/dat/des/branches/abyss.des
index 27ed234cca..7bb6293e23 100644
--- a/crawl-ref/source/dat/des/branches/abyss.des
+++ b/crawl-ref/source/dat/des/branches/abyss.des
@@ -296,7 +296,7 @@ KMONS:  1 = orange demon
 KMONS:  2 = red wasp / yellow wasp / killer bee w:2 / nothing w:2
 KMONS:  3 = death drake / green death
 KFEAT:  123 = W
-KITEM:  23 = honeycomb / nothing
+KITEM:  23 = royal jelly / nothing
 MAP
  xxxxxxx
 xx22222xx
@@ -907,7 +907,7 @@ MONS:    draconian shifter w:5 / shadow demon w:5 / lich / \
 MONS:    bone dragon / tentacled starspawn / starcursed mass / \
          apocalypse crab / dancing weapon / tentacled monstrosity / \
          glowing shapeshifter
-ITEM:    superb_item, honeycomb q:2
+ITEM:    superb_item, royal jelly q:2
 ITEM:    dart good_item q:100, any magical staff
 ITEM:    scroll of magic mapping q:4 / scroll of random uselessness q:4
 ITEM:    ring mail randart / scale mail randart / chain mail randart w:20
@@ -1428,7 +1428,7 @@ ENDMAP
 NAME:   grunt_abyss_rune_wretched_hive
 TAGS:   abyss_rune unrand patrolling
 MONS:   killer bee, wretched star, green ugly thing
-ITEM:   honeycomb q:1 / nothing w:190
+ITEM:   royal jelly q:1 / nothing w:190
 KMONS:  O = queen bee
 KITEM:  O = abyssal rune of Zot
 NSUBST: 1 = 4:3 / 1:1 / 1:. / * = 1.
diff --git a/crawl-ref/source/dat/des/branches/depths_encompass.des b/crawl-ref/source/dat/des/branches/depths_encompass.des
index 501ed2a698..c08f822f18 100644
--- a/crawl-ref/source/dat/des/branches/depths_encompass.des
+++ b/crawl-ref/source/dat/des/branches/depths_encompass.des
@@ -232,7 +232,7 @@ KMONS:   Z = queen bee
 ITEM:    ring of teleportation
 ITEM:    scroll of teleportation
 ITEM:    amulet of stasis
-KITEM:   gzZ = honeycomb w:10 / nothing w:40
+KITEM:   gzZ = royal jelly w:10 / nothing w:40
 KFEAT:   L = l
 KFEAT:   ~ = w
 KFEAT:   ^ = known teleport trap / known Zot trap
diff --git a/crawl-ref/source/dat/des/branches/lair.des b/crawl-ref/source/dat/des/branches/lair.des
index 68fd740222..a65c82bc11 100644
--- a/crawl-ref/source/dat/des/branches/lair.des
+++ b/crawl-ref/source/dat/des/branches/lair.des
@@ -379,7 +379,7 @@ MONS:    steam dragon / mottled dragon / swamp drake
 MONS:    w:20 iguana / komodo dragon / giant gecko / crocodile / nothing
 SUBST:   ? = x.c
 SHUFFLE: %*RO
-KITEM:   R = honeycomb
+KITEM:   R = royal jelly
 KFEAT:   O = enter_lair
 
 MAP
@@ -1051,7 +1051,7 @@ NAME:   minmay_lair_goldilocks
 WEIGHT: 5
 DEPTH:  Lair
 MONS:   black bear, polar bear
-ITEM:   potion of porridge / honeycomb
+ITEM:   potion of porridge
 MAP
 .......
 .xxxxx.
@@ -2654,7 +2654,7 @@ KMONS:   8 = hog
 KMONS:   9 = polar bear
 KMONS:   0 = raiju
 KITEM:   $ = any, sausage q:3
-KITEM:   % = any, honeycomb q:2
+KITEM:   % = any, royal jelly q:2
 KITEM:   *| = gold, gold, gold, acquire any
 NSUBST:  4 = 1:6 / *:4
 SHUFFLE: %'*" / '$"|
diff --git a/crawl-ref/source/dat/des/branches/spider.des b/crawl-ref/source/dat/des/branches/spider.des
index 62f28e7221..8e4a07ec16 100644
--- a/crawl-ref/source/dat/des/branches/spider.des
+++ b/crawl-ref/source/dat/des/branches/spider.des
@@ -351,7 +351,7 @@ TAGS:   no_item_gen no_monster_gen
 DEPTH:  Spider:3-
 MONS:   trapdoor spider, patrolling ghost moth
 SUBST:  | = %%d, * = ..%%d
-ITEM:   honeycomb
+ITEM:   royal jelly
 MAP
      ........
     ..xxxxxx..
@@ -375,7 +375,7 @@ NAME:   spiders_nest_ghost_moth_duel
 TAGS:   no_item_gen no_monster_gen
 DEPTH:  Spider:3-
 MONS:   ghost moth, tarantella
-ITEM:   honeycomb
+ITEM:   royal jelly
 MAP
     ........
    ..xx..xx..
@@ -431,7 +431,7 @@ SUBST:   6 = 6 *:2
 KMONS:   6 = spider / wolf spider w:4 / jumping spider w:1
 SUBST:   7 = 7 .:50
 KMONS:   7 = trapdoor spider
-KITEM:   t = honeycomb
+KITEM:   t = royal jelly
 MAP
      ..........   ......  ........
      .xwxxxxxx3....xxxx....xxxxwx..
@@ -1299,7 +1299,7 @@ NAME:   spider_rune_water
 PLACE:  Spider:$
 WEIGHT: 20
 ORIENT: northwest
-KITEM:  O = honeycomb q:3, gossamer rune of Zot
+KITEM:  O = royal jelly q:3, gossamer rune of Zot
 MONS:   ghost moth, red wasp / w:5 yellow wasp, emperor scorpion
 MONS:   wolf spider / redback / tarantella / jumping spider / w:20 nothing
 MONS:   trapdoor spider / nothing
@@ -1357,7 +1357,7 @@ WEIGHT: 20
 PLACE:  Spider:$
 ORIENT: northwest
 KITEM:  O = gossamer rune of Zot
-ITEM:   honeycomb
+ITEM:   royal jelly
 MONS:   ghost moth / w:7 nothing, moth of wrath / ghost moth, emperor scorpion
 MONS:   wolf spider / redback / tarantella / jumping spider / w:20 nothing
 MONS:   orb spider / nothing, trapdoor spider / nothing
@@ -1406,7 +1406,7 @@ TAGS:   no_pool_fixup
 ORIENT: southwest
 KITEM:  O = gossamer rune of zot
 KMONS:  O = ghost moth
-KITEM:  *d = honeycomb
+KITEM:  *d = royal jelly
 KMONS:  * = emperor scorpion
 MONS:   ghost moth, ghost moth / moth of wrath
 MONS:   yellow wasp / red wasp / w:5 nothing
@@ -1455,7 +1455,7 @@ PLACE:  Spider:$
 ORIENT: east
 NSUBST: O = 1:O / *:P
 KITEM:  O = gossamer rune of Zot
-KITEM:  P = honeycomb
+KITEM:  P = royal jelly
 MONS:   ghost moth, moth of wrath, emperor scorpion
 MONS:   wolf spider w:11 / redback / tarantella / jumping spider
 MONS:   orb spider / red wasp, trapdoor spider
@@ -1504,7 +1504,7 @@ PLACE:   Spider:$
 ORIENT:  north
 NSUBST:  d = 1:O / 3:d / *:.
 KITEM:   O = gossamer rune of Zot
-ITEM:    honeycomb
+ITEM:    royal jelly
 MONS:    ghost moth, moth of wrath, emperor scorpion
 MONS:    red wasp / yellow wasp w:2, orb spider
 MONS:    wolf spider, redback / tarantella
diff --git a/crawl-ref/source/dat/des/builder/food.des b/crawl-ref/source/dat/des/builder/food.des
index 219b0e86cb..2fc24ab5d7 100644
--- a/crawl-ref/source/dat/des/builder/food.des
+++ b/crawl-ref/source/dat/des/builder/food.des
@@ -71,7 +71,7 @@ DEPTH:  D:8-14
 WEIGHT: 15
 TAGS:   uniq_second_food extra chance_second_food
 MONS:   queen bee, killer bee
-ITEM:   honeycomb no_mimic
+ITEM:   royal jelly no_mimic
 COLOUR: a = yellow
 TILE:   a = wall_wax
 SUBST:  a = x
@@ -152,7 +152,7 @@ TAGS:   uniq_second_food extra chance_second_food no_monster_gen patrolling
 MONS:   spider / brain worm w:5 / goliath beetle / worker ant
 MONS:   yellow wasp w:7 / boring beetle / soldier ant w:13 / giant slug
 ITEM:   cheese q:3 no_mimic / beef jerky q:3 no_mimic / lemon q:3 no_mimic
-ITEM:   potion of porridge no_mimic, honeycomb q:6 no_mimic
+ITEM:   potion of porridge no_mimic, royal jelly q:6 no_mimic
 MAP
 .xxxxxxx
 @xx.x.xcccc
@@ -173,7 +173,7 @@ KMONS:  B = ooze
 : if you.absdepth() > 10 then
 KMONS:  C = slime creature
 : end
-KITEM:  C = honeycomb q:10 no_mimic / honeycomb q:15 no_mimic
+KITEM:  C = royal jelly q:10 no_mimic
 KFEAT:  C = altar_jiyva w:1 / . w:20
 KMASK:  W = no_monster_gen
 MAP
@@ -256,7 +256,7 @@ MONS:   shadow imp
 KMONS:  A = trapdoor spider w:6 / unseen horror / nothing w:4
 ITEM:  sultana q:1 no_mimic / grape w:8 q:1 no_mimic
 ITEM:  sultana mimic q:1 w:8 / grape mimic w:8 q:1
-ITEM:  honeycomb q:2 no_mimic, bread ration q:3 no_mimic
+ITEM:  royal jelly q:2 no_mimic, bread ration q:3 no_mimic
 : if crawl.coinflip() then
 :     dgn.delayed_decay(_G, 'h', 'spriggan skeleton')
 : else
@@ -297,7 +297,7 @@ KMONS:   G = necrophage
 KMONS:   H = crimson imp
 KITEM:   1 = stone q:1 no_pickup / large rock q:1 w:5
 KITEM:   Ya = bread ration no_mimic / meat ration no_mimic
-KITEM:   b = honeycomb no_mimic / cheese no_mimic / apricot q:2 no_mimic / \
+KITEM:   b = royal jelly no_mimic / cheese no_mimic / apricot q:2 no_mimic / \
              apple q:2 no_mimic / choko q:2 no_mimic
 KFEAT:   1Yab = shallow_water
 KMASK:   1Yac = no_monster_gen
diff --git a/crawl-ref/source/dat/des/builder/rooms.des b/crawl-ref/source/dat/des/builder/rooms.des
index 9ed0e789fb..750af9e6d9 100644
--- a/crawl-ref/source/dat/des/builder/rooms.des
+++ b/crawl-ref/source/dat/des/builder/rooms.des
@@ -99,7 +99,7 @@ function sroom_beehive(e)
     fill_special_room(e, "patrolling killer bee",
                       "patrolling queen bee", true)
 
-    e.kitem('12 = honeycomb / nothing')
+    e.kitem('12 = royal jelly / nothing')
 end
 
 function sroom_morgue(e)
diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
index fb3f34e4a8..00aaf9158c 100644
--- a/crawl-ref/source/dat/des/sprint/arena_sprint.des
+++ b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -1073,7 +1073,7 @@ KFEAT:  L = armour shop count:17 greed:12 type:Basic suffix:Armour use_all ; \
             mundane not_cursed centaur barding | mundane not_cursed cloak |\
             mundane not_cursed buckler | mundane not_cursed pair of gloves |\
             mundane not_cursed helmet
-KFEAT:  M = food shop count:17 type:Bee suffix:Food greed:4 ; honeycomb q:3
+KFEAT:  M = food shop count:17 type:Bee suffix:Food greed:4 ; royal jelly q:3
 KFEAT:  N = weapon shop type:Staff suffix:Store count:9 use_all greed:30 ; \
             staff of summoning | staff of wizardry |\
             staff of fire | staff of air | staff of earth | staff of cold |\
diff --git a/crawl-ref/source/dat/des/sprint/fedhas.des b/crawl-ref/source/dat/des/sprint/fedhas.des
index fbe9918511..f227587104 100644
--- a/crawl-ref/source/dat/des/sprint/fedhas.des
+++ b/crawl-ref/source/dat/des/sprint/fedhas.des
@@ -37,7 +37,7 @@ KMONS:  h = moth of wrath
 KMONS:  m = green rat
 KMONS:  n = worker ant
 KMONS:  u = rat
-KITEM:  j = honeycomb q:3
+KITEM:  j = royal jelly q:3
 KITEM:  n = ring of invisibility ident:type
 KITEM:  M = any book
 KITEM:  # = Orb of Zot
diff --git a/crawl-ref/source/dat/des/sprint/sprint_mu.des b/crawl-ref/source/dat/des/sprint/sprint_mu.des
index 9f79eaddd3..3a6edab377 100644
--- a/crawl-ref/source/dat/des/sprint/sprint_mu.des
+++ b/crawl-ref/source/dat/des/sprint/sprint_mu.des
@@ -168,7 +168,7 @@ MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
 MONS: patrolling human hd:2 hp:35
 KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
  potion of cure mutation ident:all q:2 / potion of cure mutation q:1 / any potion, \
- meat ration / bread ration / honeycomb w:20 / choko, \
+ meat ration / bread ration / royal jelly w:20 / choko, \
  scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \
  scroll of identify ident:all q:2/ scroll of identify q:1 / any scroll, \
  scroll of torment / scroll of holy word / scroll of immolation, \
@@ -201,7 +201,7 @@ MONS: patrolling phantom hd:2 / patrolling wolf hd:2 / patrolling scorpion / \
 MONS: patrolling human hd:2 hp:35
 KITEM: * = potion of flight ident:all q:2 / potion of flight q:1 / any potion, \
  potion of cure mutation ident:all q:2 / potion of cure mutation q:1 / any potion, \
- meat ration / bread ration / honeycomb w:20 / choko, \
+ meat ration / bread ration / royal jelly w:20 / choko, \
  scroll of remove curse ident:all q:2 / scroll of remove curse q:1 / any scroll, \
  scroll of identify ident:all q:2 / scroll of identify q:1 / any scroll, \
  scroll of torment / scroll of holy word / scroll of immolation, \
@@ -268,7 +268,7 @@ KFEAT: l = altar_lugonu
 KFEAT: J = altar_jiyva
 KMONS: m = shadow
 KMONS: j = patrolling jelly
-KITEM: * = honeycomb
+KITEM: * = royal jelly
 COLOUR: # = yellow
 KFEAT: # = closed_door
 : lua_marker('#', props_marker {
@@ -445,9 +445,9 @@ ENDMAP
 NAME: sprint_mu_hive_nellie
 TAGS: sprint_mu_hive no_rotate no_hmirror no_vmirror
 KMONS: 1 = killer bee
-KITEM: 1 = honeycomb w:30 / nothing
+KITEM: 1 = royal jelly w:30 / nothing
 KMONS: 2 = queen bee
-KITEM: 2 = honeycomb
+KITEM: 2 = royal jelly
 KMONS: 3 = generate_awake Nellie
 KITEM: 3 = demonic rune of zot
 : acq_on_sight(_G, '3', {"food","misc","wand"})
diff --git a/crawl-ref/source/dat/des/variable/large_themed.des b/crawl-ref/source/dat/des/variable/large_themed.des
index a748b1c774..f288b2a236 100644
--- a/crawl-ref/source/dat/des/variable/large_themed.des
+++ b/crawl-ref/source/dat/des/variable/large_themed.des
@@ -94,7 +94,7 @@ WEIGHT: 5
 TAGS:   uniq_black_bear_nest
 DEPTH:  D:4-8
 NSUBST: ' = 1:1 / 2:R / *:.
-KITEM:  R = honeycomb
+KITEM:  R = royal jelly
 MONS:   patrolling black bear
 MAP
 xxxxxxxxxxxxxxx
@@ -112,7 +112,7 @@ WEIGHT: 5
 TAGS:   uniq_black_bear_nest
 DEPTH:  D:4-8
 NSUBST: ' = 1:1 / 2:R / *:.
-KITEM:  R = honeycomb
+KITEM:  R = royal jelly
 MONS:   patrolling black bear
 MAP
 xxxxxxxx@xx
@@ -1440,7 +1440,7 @@ DEPTH:   D:12-
 ORIENT:  north
 MONS:    killer bee, queen bee, oklob plant
 KFEAT:   X = x
-ITEM:    honeycomb / honeycomb / honeycomb
+ITEM:    royal jelly
 KITEM:   | = |
 SUBST:   A = X:3 .:2, z = x.., ' = .:460 01d%
 : if you.absdepth() > 14 then
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index dcab4ba798..17da4f03bd 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -131,7 +131,7 @@ SUBST:  ? : .w
 SUBST:  1 = 1 a:2, 1 : 1:15 2 3:2
 SUBST:  * : * R:3
 KITEM:  * = *
-KITEM:  R = honeycomb
+KITEM:  R = royal jelly
 COLOUR: x = yellow
 TILE:   x = wall_wax
 MAP
@@ -154,7 +154,7 @@ NAME:   minivault_7
 TAGS:   uniq_beehive
 DEPTH:  D:9-
 MONS:   patrolling queen bee, patrolling killer bee
-KITEM:  R = honeycomb
+KITEM:  R = royal jelly
 COLOUR: x = yellow
 TILE:   x = wall_wax
 MAP
@@ -1817,7 +1817,7 @@ MONS:  ettin ; rod of the swarm ident:type . great mace
 : end
 MONS:  killer bee w:3 / wolf spider w:1 / scorpion w:1 / worm w:1
 MONS:  worker ant w:3 / vampire mosquito w:1 / goliath beetle w:1 / yellow wasp w:1
-ITEM: honeycomb
+ITEM: royal jelly
 MAP
 xxxxxx
 x32*dx
@@ -2851,7 +2851,7 @@ NAME:    minislime_mu
 TAGS:    no_monster_gen no_item_gen
 DEPTH:   Depths, !Depths:$
 MONS:    large slime creature, great orb of eyes, eye of draining
-KITEM:   R = honeycomb
+KITEM:   R = royal jelly
 ITEM:    ring of teleportation / scroll of teleportation w:30 q:2
 ITEM:    wand of digging / wand of disintegration
 ITEM:    stone of tremors
diff --git a/crawl-ref/source/dat/descript/cs/items.txt b/crawl-ref/source/dat/descript/cs/items.txt
index 962c3fe5e2..0c39f9e3cb 100644
--- a/crawl-ref/source/dat/descript/cs/items.txt
+++ b/crawl-ref/source/dat/descript/cs/items.txt
@@ -123,10 +123,6 @@ helmet
 
 Část kovové pokrývky hlavy.
 %%%%
-honeycomb
-
-Kus lahodného plástve obřích včel.
-%%%%
 lajatang
 
 Velmi vzácná a velmi efektivní dovážená zbraň. Představuje jí tyč s
diff --git a/crawl-ref/source/dat/descript/da/items.txt b/crawl-ref/source/dat/descript/da/items.txt
index 33a9fced4e..7bbeb5f2b7 100644
--- a/crawl-ref/source/dat/descript/da/items.txt
+++ b/crawl-ref/source/dat/descript/da/items.txt
@@ -391,10 +391,6 @@ helmet
 
 En hovedbeklædning af metal.
 %%%%
-honeycomb
-
-En klump lækker bikage, som er lavet af kæmpebier.
-%%%%
 ice dragon hide
 
 Det skællede skind fra en drage med kuldeånde. Det kan laves om til en rigtig
@@ -684,6 +680,11 @@ rod of the swarm
 
 Denne stok lader brugeren hidkalde en sværm af insekter.
 %%%%
+royal jelly
+
+En særligt fed og gylden geléagtig tingest. Hvis du indtager den, giver den,
+udover næring, dig dine tabte evner tilbage.
+%%%%
 rune of zot
 
 En talisman, som lader dig træde ind i Zots domæne.
diff --git a/crawl-ref/source/dat/descript/de/items.txt b/crawl-ref/source/dat/descript/de/items.txt
index 8d46c002a0..d32f4436a5 100644
--- a/crawl-ref/source/dat/descript/de/items.txt
+++ b/crawl-ref/source/dat/descript/de/items.txt
@@ -361,10 +361,6 @@ helmet
 
 Ein Stück einer Kopfbedeckung aus Metall.
 %%%%
-honeycomb
-
-Ein Klumpen von einer köstlichen Honigwabe, von riesigen Bienen geschaffen.
-%%%%
 ice dragon hide
 
 Die schuppige Haut eines Kälte atmenden Drachen. Es kann in die richtige
@@ -618,6 +614,12 @@ rod of the swarm
 
 Dieser Stab erlaubt seinem Benutzer einen Schwarm Insekten zu rufen.
 %%%%
+royal jelly
+
+Eine besonders reiche und goldene gallertartige Sache. Der Konsum wird
+verlorene Fähigkeiten wieder herstellen, zusätzlich zu der Ernährung die es
+bietet.
+%%%%
 rune of zot
 
 Ein Talisman, der Eintritt in Zots Reich gewährt.
diff --git a/crawl-ref/source/dat/descript/el/items.txt b/crawl-ref/source/dat/descript/el/items.txt
index ece5453e14..c70afc808c 100644
--- a/crawl-ref/source/dat/descript/el/items.txt
+++ b/crawl-ref/source/dat/descript/el/items.txt
@@ -277,10 +277,6 @@ helmet
 
 Ένα μεταλλικό κράνος.
 %%%%
-honeycomb
-
-Ένα κομμάτι από γευστική κερήθρα που φτιάχνουν γιγαντιαίες μέλισσες.
-%%%%
 ice dragon hide
 
 Το φολιδωτό δέρμα ενός δράκου. Μπορεί να μετατραπεί σε κανονική πανοπλία, αλλά
diff --git a/crawl-ref/source/dat/descript/es/items.txt b/crawl-ref/source/dat/descript/es/items.txt
index 4e1be82a21..6ad05ffd35 100644
--- a/crawl-ref/source/dat/descript/es/items.txt
+++ b/crawl-ref/source/dat/descript/es/items.txt
@@ -286,10 +286,6 @@ helmet
 
 Una protección metálica para la cabeza.
 %%%%
-honeycomb
-
-Un trozo de un panal de miel, creado por abejas gigantes.
-%%%%
 ice dragon hide
 
 La escamosa piel de un dragón. Puede usarse para elaborar una armadura, pero
@@ -526,6 +522,11 @@ ring of wizardry
 
 Este anillo incrementa la habilidad de su portador para usar hechizos mágicos.
 %%%%
+royal jelly
+
+Una cosa gelatinosa dorada bastante nutritiva. Consumirla restaurará tus
+habilidades, además de que es saludable.
+%%%%
 rune of zot
 
 Un talismán que permite la entrada a los dominios de Zot.
diff --git a/crawl-ref/source/dat/descript/fr/items.txt b/crawl-ref/source/dat/descript/fr/items.txt
index 1a1812b7a2..c27e60e7a2 100644
--- a/crawl-ref/source/dat/descript/fr/items.txt
+++ b/crawl-ref/source/dat/descript/fr/items.txt
@@ -543,10 +543,6 @@ helmet
 
 Un couvre-chef en métal.
 %%%%
-honeycomb
-
-Un morceau de ruche d'abeilles géantes, gorgé de succulent miel.
-%%%%
 horn of Geryon
 
 La corne de Geryon, le gardien du Vestibule des Enfers. Les légendes racontent
@@ -870,6 +866,11 @@ rod of the swarm
 
 Ce sceptre permet à son porteur de convoquer un essaim d'insectes.
 %%%%
+royal jelly
+
+Une gelée dorée et particulièrement nourrissante. La consommer restaure les
+caractéristiques en plus de la satiété qu'elle apporte.
+%%%%
 rune of zot
 
 Un talisman qui permet d'entrer dans le domaine de Zot.
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 386a18e4b8..5a13ab55bc 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -630,10 +630,6 @@ helmet
 
 A piece of metal headgear.
 %%%%
-honeycomb
-
-A lump of the delicious honeycomb made by giant bees.
-%%%%
 horn of Geryon
 
 The horn belonging to Geryon, guardian of the Vestibule of Hell. Legends say
@@ -1142,6 +1138,10 @@ rod of the swarm
 
 This rod allows its wielder to summon a swarm of insects.
 %%%%
+royal jelly
+
+A particularly rich and golden gelatinous thing.
+%%%%
 rune of zot
 
 A talisman which allows entry into Zot's domain.
diff --git a/crawl-ref/source/dat/descript/ja/items.txt b/crawl-ref/source/dat/descript/ja/items.txt
index f7cc3c03a2..3210ff3d65 100644
--- a/crawl-ref/source/dat/descript/ja/items.txt
+++ b/crawl-ref/source/dat/descript/ja/items.txt
@@ -333,10 +333,6 @@ helmet
 
 金属製の被り物だ。
 %%%%
-honeycomb
-
-一塊の巨大なミツバチによって作られた、美味しい蜂の巣だ。
-%%%%
 ice dragon hide
 
 これは冷気を吐くドラゴンの鱗に覆われた皮だ。
@@ -556,6 +552,11 @@ rod of the swarm
 
 このロッドは手にしている者に昆虫の群れを召喚することを可能にする。
 %%%%
+royal jelly
+
+とりわけ豪華な、金色をしたゼリー状の存在だ。 Consuming it will restore lost
+abilities, in addition to the nutrition it provides.
+%%%%
 rune of zot
 
 ゾットの領域に訪れることを可能にする御守りだ。
diff --git a/crawl-ref/source/dat/descript/ko/items.txt b/crawl-ref/source/dat/descript/ko/items.txt
index d76fa31156..807eb966f7 100644
--- a/crawl-ref/source/dat/descript/ko/items.txt
+++ b/crawl-ref/source/dat/descript/ko/items.txt
@@ -363,10 +363,6 @@ helmet
 
 평범한 금속제 투구다.
 %%%%
-honeycomb
-
-거대한 벌들이 만든, 꿀이 가득한 맛있는 벌집이다.
-%%%%
 ice dragon hide
 
 냉기를 뿜는 용에게서 벗겨 낸 비늘 덮인 가죽이다. 이 가죽은 방어구 강화
@@ -645,6 +641,11 @@ rod of the swarm
 
 이 지팡이는 사용자가 벌레떼를 소환할 수 있도록 해준다.
 %%%%
+royal jelly
+
+아주 호화로운 금빛을 한 젤라틴 덩어리다. 일반적인 보존식량보다 더 많은 만복도를
+회복시켜주는 것은 물론, 손실된 능력치까지도 회복시켜준다.
+%%%%
 rune of zot
 
 조트의 방으로 갈 수 있게 해주는 일종의 부적이다.
diff --git a/crawl-ref/source/dat/descript/pl/items.txt b/crawl-ref/source/dat/descript/pl/items.txt
index c4f1d695dd..8b35875ccc 100644
--- a/crawl-ref/source/dat/descript/pl/items.txt
+++ b/crawl-ref/source/dat/descript/pl/items.txt
@@ -293,11 +293,6 @@ helmet
 
 Metalowe nakrycie głowy.
 %%%%
-honeycomb
-
-Jakkolwiek pszczoły spotykane w tych lochach osiągają ogromne rozmiary, miód
-przez nie produkowany w niczym nie ustępuje temu z powierzchni.
-%%%%
 ice dragon hide
 
 Łuskowata skóra lodowego smoka, w surowej postaci. Można z niej zrobić dobrą
@@ -569,6 +564,11 @@ rod of the swarm
 
 Ten pręt pozwala przyzwać chmarę owadów.
 %%%%
+royal jelly
+
+Lekko złotawa galaretowata substancja, wyjątkowo bogata w składniki odżywcze.
+Oprócz wartości pokarmowych, pozwala także odzyskać utracone siły.
+%%%%
 rune of zot
 
 Talizman który pozwala otworzyć bramę do krainy Zot.
diff --git a/crawl-ref/source/dat/descript/pt/items.txt b/crawl-ref/source/dat/descript/pt/items.txt
index ddacf2cea8..1515eb7889 100644
--- a/crawl-ref/source/dat/descript/pt/items.txt
+++ b/crawl-ref/source/dat/descript/pt/items.txt
@@ -194,10 +194,6 @@ helmet
 
 Uma peça de armadura para a cabeça.
 %%%%
-honeycomb
-
-Um delicioso naco de favo de mel feito por abelhas gigantes.
-%%%%
 javelin
 
 Esta lança leve foi projetada para ser arremessada e causar muito dano.
diff --git a/crawl-ref/source/dat/descript/ru/items.txt b/crawl-ref/source/dat/descript/ru/items.txt
index afd45644f3..ab27e7abf4 100644
--- a/crawl-ref/source/dat/descript/ru/items.txt
+++ b/crawl-ref/source/dat/descript/ru/items.txt
@@ -245,10 +245,6 @@ helmet
 
 Металлический элемент доспеха, предназначенный для защиты головы.
 %%%%
-honeycomb
-
-Кусок вкуснейших сот с мёдом, изготовленных гигантскими пчёлами.
-%%%%
 ice dragon hide
 
 Покрытая чешуёй шкура ледяного дракона. Её можно превратить в полноценный
diff --git a/crawl-ref/source/dat/descript/zh/items.txt b/crawl-ref/source/dat/descript/zh/items.txt
index 29e0d50f10..b04fb04b84 100644
--- a/crawl-ref/source/dat/descript/zh/items.txt
+++ b/crawl-ref/source/dat/descript/zh/items.txt
@@ -287,10 +287,6 @@ helmet
 
 一个金属头盔。
 %%%%
-honeycomb
-
-一块美味的蜂房；制作者是地城里的巨型蜜蜂。
-%%%%
 ice dragon hide
 
 一条冰龙的鳞皮。你可以把它加工成正式的铠甲；但即使是在未加工情况下，
@@ -521,6 +517,10 @@ rod of the swarm
 
 这根法杖能召唤出一大群昆虫。
 %%%%
+royal jelly
+
+一团金色的胶状物质。食用它不仅能提供营养，还可以回复食用者失去的属性值。
+%%%%
 rune of zot
 
 这个神符是打开佐特老巢大门的钥匙。
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 21e10c7355..1ab75b9ee8 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1846,8 +1846,8 @@ void finished_eating_message(int food_type)
 
     switch (food_type)
     {
-    case FOOD_HONEYCOMB:
-        mpr("That honeycomb was delicious!");
+    case FOOD_ROYAL_JELLY:
+        mpr("That royal jelly was delicious!");
         break;
     case FOOD_PIZZA:
     {
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 0779a025c8..7c1174ed74 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1574,7 +1574,7 @@ string item_def::name_aux(description_level_type desc, bool terse, bool ident,
         case FOOD_PEAR: buff << "pear"; break;
         case FOOD_APPLE: buff << "apple"; break;
         case FOOD_CHOKO: buff << "choko"; break;
-        case FOOD_HONEYCOMB: buff << "honeycomb"; break;
+        case FOOD_ROYAL_JELLY: buff << "royal jelly"; break;
         case FOOD_SNOZZCUMBER: buff << "snozzcumber"; break;
         case FOOD_PIZZA: buff << "slice of pizza"; break;
         case FOOD_APRICOT: buff << "apricot"; break;
@@ -2433,7 +2433,7 @@ void check_item_knowledge(bool unknown_items)
         };
         static const int misc_ST_list[] =
         {
-            FOOD_CHUNK, FOOD_MEAT_RATION, FOOD_PEAR, FOOD_HONEYCOMB,
+            FOOD_CHUNK, FOOD_MEAT_RATION, FOOD_PEAR, FOOD_ROYAL_JELLY,
             BOOK_MANUAL, NUM_RODS, 1, MISC_RUNE_OF_ZOT,
             NUM_MISCELLANY
         };
diff --git a/crawl-ref/source/itemprop-enum.h b/crawl-ref/source/itemprop-enum.h
index ce9edd8cd8..58b8242f5f 100644
--- a/crawl-ref/source/itemprop-enum.h
+++ b/crawl-ref/source/itemprop-enum.h
@@ -605,9 +605,9 @@ enum food_type
     FOOD_PEAR,
     FOOD_APPLE,
     FOOD_CHOKO,
-    FOOD_HONEYCOMB,
-#if TAG_MAJOR_VERSION == 34
     FOOD_ROYAL_JELLY,
+#if TAG_MAJOR_VERSION == 34
+    FOOD_UNUSED, // was: royal jelly
 #endif
     FOOD_SNOZZCUMBER,
     FOOD_PIZZA,
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 0f6377eee6..e54eb363c1 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -426,7 +426,7 @@ static const food_def Food_prop[NUM_FOODS] =
     { FOOD_GRAPE,        "grape",         100,   -20,    20,   2, 1, FFL_FRUIT},
     { FOOD_SULTANA,      "sultana",        70,   -20,    20,   1, 1, FFL_FRUIT},
 
-    { FOOD_HONEYCOMB,    "honeycomb",    2000,     0,     0,  40, 2, FFL_NONE },
+    { FOOD_ROYAL_JELLY,  "royal jelly",  2000,     0,     0,  40, 2, FFL_NONE },
     { FOOD_PIZZA,        "pizza",        1500,     0,     0,  40, 2, FFL_NONE },
     { FOOD_CHEESE,       "cheese",       1200,     0,     0,  40, 2, FFL_NONE },
 };
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 6bbfbeeb2d..c4c7f64233 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2571,7 +2571,7 @@ static int _autopickup_subtype(const item_def &item)
         return (item.sub_type == FOOD_CHUNK) ? item.sub_type
              : food_is_meaty(item)           ? FOOD_MEAT_RATION
              : is_fruit(item)                ? FOOD_PEAR
-                                             : FOOD_HONEYCOMB;
+                                             : FOOD_ROYAL_JELLY;
     case OBJ_MISCELLANY:
         return (item.sub_type == MISC_RUNE_OF_ZOT) ? item.sub_type : max_type;
     case OBJ_BOOKS:
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 93bed40d74..080833e461 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -377,7 +377,7 @@ void item_colour(item_def &item)
             break;
         case FOOD_BANANA:
         case FOOD_CHEESE:
-        case FOOD_HONEYCOMB:
+        case FOOD_ROYAL_JELLY:
         case FOOD_LEMON:
         case FOOD_PIZZA:
             item.colour = YELLOW;
@@ -2250,7 +2250,7 @@ static void _generate_food_item(item_def& item, int force_quant, int force_type)
                                                  1, FOOD_LYCHEE,
                                                  1, FOOD_BEEF_JERKY,
                                                  1, FOOD_SAUSAGE,
-                                                 1, FOOD_HONEYCOMB,
+                                                 1, FOOD_ROYAL_JELLY,
                                                  0);
     }
     else
diff --git a/crawl-ref/source/rltiles/UNUSED/other/lump_of_royal_jelly.png b/crawl-ref/source/rltiles/UNUSED/other/lump_of_royal_jelly.png
deleted file mode 100644
index 3f356ae79a..0000000000
--- a/crawl-ref/source/rltiles/UNUSED/other/lump_of_royal_jelly.png
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index b874133099..1d4963e208 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -550,7 +550,7 @@ bread_ration FOOD_BREAD_RATION
 pear FOOD_PEAR
 apple FOOD_APPLE
 choko FOOD_CHOKO
-honeycomb FOOD_HONEYCOMB
+lump_of_royal_jelly FOOD_ROYAL_JELLY
 snozzcumber FOOD_SNOZZCUMBER
 pizza FOOD_PIZZA
 apricot FOOD_APRICOT
diff --git a/crawl-ref/source/rltiles/item/food/honeycomb.png b/crawl-ref/source/rltiles/item/food/honeycomb.png
deleted file mode 100644
index 4d4a6bb953..0000000000
--- a/crawl-ref/source/rltiles/item/food/honeycomb.png
+++ /dev/null
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 568b83e62a..1c7899de29 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1497,7 +1497,7 @@ unsigned int item_value(item_def item, bool ident)
             valued = 44;
             break;
 
-        case FOOD_HONEYCOMB:
+        case FOOD_ROYAL_JELLY:
             valued = 20;
             break;
 
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index e53e917f72..60acd59b09 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -3114,7 +3114,7 @@ static void tag_read_you_items(reader &th)
         const int oldstate = you.force_autopickup[OBJ_FOOD][NUM_FOODS];
         you.force_autopickup[OBJ_FOOD][FOOD_MEAT_RATION] = oldstate;
         you.force_autopickup[OBJ_FOOD][FOOD_PEAR] = oldstate;
-        you.force_autopickup[OBJ_FOOD][FOOD_HONEYCOMB] = oldstate;
+        you.force_autopickup[OBJ_FOOD][FOOD_ROYAL_JELLY] = oldstate;
 
         you.force_autopickup[OBJ_BOOKS][BOOK_MANUAL] =
             you.force_autopickup[OBJ_BOOKS][NUM_BOOKS];
@@ -3699,10 +3699,10 @@ void unmarshallItem(reader &th, item_def &item)
         if (item.base_type == OBJ_BOOKS && item.sub_type == BOOK_WAR_CHANTS)
             item.sub_type = BOOK_BATTLE;
 
-        if (item.base_type == OBJ_FOOD && (item.sub_type == FOOD_ROYAL_JELLY
+        if (item.base_type == OBJ_FOOD && (item.sub_type == FOOD_UNUSED
                                            || item.sub_type == FOOD_AMBROSIA))
         {
-            item.sub_type = FOOD_HONEYCOMB;
+            item.sub_type = FOOD_ROYAL_JELLY;
         }
     }
 
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 77af8d4eef..55a7426f48 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -3410,7 +3410,7 @@ static tileidx_t _tileidx_food(const item_def &item)
     case FOOD_PEAR:         return TILE_FOOD_PEAR;
     case FOOD_APPLE:        return TILE_FOOD_APPLE;
     case FOOD_CHOKO:        return TILE_FOOD_CHOKO;
-    case FOOD_HONEYCOMB:    return TILE_FOOD_HONEYCOMB;
+    case FOOD_ROYAL_JELLY:  return TILE_FOOD_ROYAL_JELLY;
     case FOOD_SNOZZCUMBER:  return TILE_FOOD_SNOZZCUMBER;
     case FOOD_PIZZA:        return TILE_FOOD_PIZZA;
     case FOOD_APRICOT:      return TILE_FOOD_APRICOT;