diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index feca3d93858..1af3fb8ab91 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -278,6 +278,13 @@ /obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM) if(..()) qdel(src) +/obj/item/weapon/grown/bananapeel/mimanapeel + name = "mimana peel" + desc = "A mimana peel." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "mimana_peel" + + /obj/item/weapon/grown/corncob name = "corn cob" desc = "A reminder of meals gone by." @@ -316,9 +323,11 @@ /obj/item/weapon/grown/snapcorn/attack_self(mob/user as mob) ..() - user << "You pick up the snap pops from the cob." - for(var/i, i<=snap_pops, i++) - new /obj/item/toy/snappop(user.loc) - user.unEquip(src) - new /obj/item/weapon/grown/corncob(user.loc) - qdel(src) + user << "You pick up a snap pops from the cob." + var/obj/item/toy/snappop/S = new /obj/item/toy/snappop(user.loc) + if(ishuman(user)) + user.put_in_hands(S) + snap_pops -= 1 + if(!snap_pops) + new /obj/item/weapon/grown/corncob(user.loc) + qdel(src) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 201a1e443db..8347cdc2094 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -210,7 +210,7 @@ name = "pack of mimana seeds" desc = "They're seeds that grow into mimana trees. When grown, keep away from mime." icon_state = "seed-mimana" - species = "banana" + species = "mimana" plantname = "Mimana Tree" product = /obj/item/weapon/reagent_containers/food/snacks/grown/mimana lifespan = 50 diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 2e7f07102ee..87a9618ded7 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -216,7 +216,7 @@ playsound(user, fire_sound, 50, 1) var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) var/limb_name = affecting.getDisplayName() - if(affecting == "head" || affecting == "eyes" || affecting == "mouth") + if(affecting.name == "head" || affecting.name == "eyes" || affecting.name == "mouth") user.apply_damage(300, BRUTE, affecting) user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!") else diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi index 5f5b7733063..fd0f0dcc7c6 100644 Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index c95d3480f01..f841e089491 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ