diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm
index 0fed81d7bb8..430e60db662 100644
--- a/code/game/asteroid.dm
+++ b/code/game/asteroid.dm
@@ -126,7 +126,7 @@ var/global/max_secret_rooms = 6
if("plantlab")
theme = "plantlab"
treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/sunflower/novaflower=2,/obj/item/seeds/tomato/blue/bluespace=2,/obj/item/seeds/tomato/blue=2,
- /obj/item/seeds/coffee/robusta=2, /obj/item/seeds/cash=2)
+ /obj/item/seeds/coffee/robusta=2, /obj/item/seeds/firelemon=2)
fluffitems = list(/obj/item/weapon/twohanded/required/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics/constructable=1,
/obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2,
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3)
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index f9e55151249..d7ea29aa27c 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -68,24 +68,24 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "lime-grow"
icon_dead = "lime-dead"
- mutatelist = list(/obj/item/seeds/cash)
+ mutatelist = list(/obj/item/seeds/firelemon)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.05)
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon
seed = /obj/item/seeds/lemon
name = "lemon"
- desc = "When life gives you lemons, be grateful they aren't limes."
+ desc = "When life gives you lemons, make lemonade."
icon_state = "lemon"
filling_color = "#FFD700"
-// Money Lemon
-/obj/item/seeds/cash
- name = "pack of money seeds"
- desc = "When life gives you lemons, mutate them into cash."
- icon_state = "seed-cash"
- species = "cashtree"
- plantname = "Money Tree"
- product = /obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit
+// Combustible lemon
+/obj/item/seeds/firelemon //combustible lemon is too long so firelemon
+ name = "pack of combustible lemon seeds"
+ desc = "When life gives you lemons, don't make lemonade. Make life take the lemons back! Get mad! I don't want your damn lemons!"
+ icon_state = "seed-firelemon"
+ species = "firelemon"
+ plantname = "Combustible Lemon Tree"
+ product = /obj/item/weapon/reagent_containers/food/snacks/grown/firelemon
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "lime-grow"
icon_dead = "lime-dead"
@@ -93,31 +93,57 @@
endurance = 45
yield = 4
reagents_add = list("nutriment" = 0.05)
- rarity = 50 // Nanotrasen approves...
-/obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit
- seed = /obj/item/seeds/cash
- name = "Money Fruit"
- desc = "Looks like a lemon with something bulging from the inside."
- icon_state = "moneyfruit"
+/obj/item/weapon/reagent_containers/food/snacks/grown/firelemon
+ seed = /obj/item/seeds/firelemon
+ name = "Combustible Lemon"
+ desc = "Made for burning houses down."
+ icon_state = "firelemon"
bitesize_mod = 2
-/obj/item/weapon/reagent_containers/food/snacks/grown/shell/moneyfruit/add_juice()
+/obj/item/weapon/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
+ var/area/A = get_area(user)
+ user.visible_message("[user] primes the [src]!", "You prime the [src]!")
+ message_admins("[user] ([user.key ? user.key : "no key"]) primed a combustible lemon for detonation at [A] ([user.x], [user.y], [user.z]) (JMP)")
+ log_game("[user] ([user.key ? user.key : "no key"]) primed a combustible lemon for detonation at [A] ([user.x],[user.y],[user.z]).")
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.throw_mode_on()
+ prime()
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/burn()
+ prime()
..()
- switch(seed.potency)
- if(0 to 10)
- trash = /obj/item/stack/spacecash
- if(11 to 20)
- trash = /obj/item/stack/spacecash/c10
- if(21 to 30)
- trash = /obj/item/stack/spacecash/c20
- if(31 to 40)
- trash = /obj/item/stack/spacecash/c50
- if(41 to 50)
- trash = /obj/item/stack/spacecash/c100
- if(51 to 60)
- trash = /obj/item/stack/spacecash/c200
- if(61 to 80)
- trash = /obj/item/stack/spacecash/c500
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/proc/update_mob()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.unEquip(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/ex_act(severity)
+ qdel(src) //Ensuring that it's deleted by its own explosion
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/firelemon/proc/prime()
+ icon_state = "firelemon_active"
+ playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+ switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang.
+ if(0 to 30)
+ update_mob()
+ explosion(src.loc,-1,-1,2, flame_range = 1)
+ qdel(src)
+ if(31 to 50)
+ update_mob()
+ explosion(src.loc,-1,-1,2, flame_range = 2)
+ qdel(src)
+ if(51 to 70)
+ update_mob()
+ explosion(src.loc,-1,-1,2, flame_range = 3)
+ qdel(src)
+ if(71 to 90)
+ update_mob()
+ explosion(src.loc,-1,-1,2, flame_range = 4)
+ qdel(src)
else
- trash = /obj/item/stack/spacecash/c1000
\ No newline at end of file
+ update_mob()
+ explosion(src.loc,-1,-1,2, flame_range = 5)
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 7408cd520ed..0b016058c9b 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -45,7 +45,7 @@
for(var/i in 1 to 3)
new /obj/item/weapon/reagent_containers/glass/beaker/noreact(src)
if(31 to 35)
- new /obj/item/seeds/cash(src)
+ new /obj/item/seeds/firelemon(src)
if(36 to 40)
new /obj/item/weapon/melee/baton(src)
if(41 to 45)
diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi
index 0f0f7c9b733..ac8adc5a069 100644
Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 0b55e2e8652..61e2de5aa2f 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index f24d177e45c..5e28a475cf3 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ